openstack/kolla-ansible
Code Issues Proposed changes

Merge "Updating ironic configurations in nova.conf"

Browse Source
This commit is contained in:
Jenkins 2016-09-05 16:07:59 +00:00 committed by Gerrit Code Review
commit 48ade16227
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/nova/templates/nova.conf.j2
View File

@ -34,11 +34,11 @@ linuxnet_interface_driver = nova.network.linux_net.NeutronLinuxBridgeInterfaceDr
allow_resize_to_same_host = true allow_resize_to_same_host = true
{% if enable_ironic | bool %} {% if enable_ironic | bool %}
scheduler_host_manager = nova.scheduler.ironic_host_manager.IronicHostManager scheduler_host_manager = ironic_host_manager
{% endif %} {% endif %}
{% if service_name == "nova-compute-ironic" %} {% if service_name == "nova-compute-ironic" %}
compute_driver = nova.virt.ironic.IronicDriver compute_driver = ironic.IronicDriver
vnc_enabled = False vnc_enabled = False
ram_allocation_ratio = 1.0 ram_allocation_ratio = 1.0
reserved_host_memory_mb = 0 reserved_host_memory_mb = 0
@ -95,7 +95,7 @@ html5proxy_port = {{ nova_spicehtml5proxy_port }}
[ironic] [ironic]
admin_username = {{ ironic_keystone_user }} admin_username = {{ ironic_keystone_user }}
admin_password = {{ ironic_keystone_password }} admin_password = {{ ironic_keystone_password }}
admin_url = {{ openstack_auth.auth_url }} admin_url = {{ openstack_auth.auth_url }}/v2.0
admin_tenant_name = service admin_tenant_name = service
api_endpoint = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ ironic_api_port }}/v1 api_endpoint = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ ironic_api_port }}/v1
{% endif %} {% endif %}