diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-05 16:07:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-05 16:07:59 +0000 |
| commit | 48ade162278b32cc1c2cbf83d4c04c744f5a7986 (patch) | |
| tree | 85ef79e9c12f6b89566dc08b610760918084d42f /ansible | |
| parent | 3a122697c627dc8657bde1be4ae56171b58e1c6f (diff) | |
| parent | 2bf3ce5de8c3d27841e105d3b56b10aa934dd1e9 (diff) | |
| download | kolla-48ade162278b32cc1c2cbf83d4c04c744f5a7986.tar.gz kolla-48ade162278b32cc1c2cbf83d4c04c744f5a7986.zip | |
Merge "Updating ironic configurations in nova.conf"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/nova/templates/nova.conf.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2 index b3a5d7b84..e5fbc5099 100644 --- a/ansible/roles/nova/templates/nova.conf.j2 +++ b/ansible/roles/nova/templates/nova.conf.j2 @@ -34,11 +34,11 @@ linuxnet_interface_driver = nova.network.linux_net.NeutronLinuxBridgeInterfaceDr allow_resize_to_same_host = true {% if enable_ironic | bool %} -scheduler_host_manager = nova.scheduler.ironic_host_manager.IronicHostManager +scheduler_host_manager = ironic_host_manager {% endif %} {% if service_name == "nova-compute-ironic" %} -compute_driver = nova.virt.ironic.IronicDriver +compute_driver = ironic.IronicDriver vnc_enabled = False ram_allocation_ratio = 1.0 reserved_host_memory_mb = 0 @@ -95,7 +95,7 @@ html5proxy_port = {{ nova_spicehtml5proxy_port }} [ironic] admin_username = {{ ironic_keystone_user }} admin_password = {{ ironic_keystone_password }} -admin_url = {{ openstack_auth.auth_url }} +admin_url = {{ openstack_auth.auth_url }}/v2.0 admin_tenant_name = service api_endpoint = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ ironic_api_port }}/v1 {% endif %} |