diff options
| author | Narasimha SV <narasimha18sv@gmail.com> | 2016-09-01 06:43:49 -0400 |
|---|---|---|
| committer | Narasimha SV <narasimha18sv@gmail.com> | 2016-09-01 10:06:12 -0400 |
| commit | 2bf3ce5de8c3d27841e105d3b56b10aa934dd1e9 (patch) | |
| tree | 82859da7eb50af5c27c7c2ddc49be4a0dfc451df /ansible | |
| parent | 0bf7e9b66d0cfe029d5d702dec41d03a60fe1c18 (diff) | |
| download | kolla-2bf3ce5de8c3d27841e105d3b56b10aa934dd1e9.tar.gz kolla-2bf3ce5de8c3d27841e105d3b56b10aa934dd1e9.zip | |
Updating ironic configurations in nova.conf
Irnoic configurations in nova compute node have been changed with
respect to the master code of ironic and nova. admin_url
configuration is with v3 version but other details are with
respect to v2.0 version of keystone authentication.
Updated scheduler_host_manager, compute_driver and admin_url
values in the nova.conf template to support ironic master
branch code.
Change-Id: I78bee3fdf082bcd526507b479be3afaee80ba899
Closes-Bug: #1619211
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 792f8d0b5..3d39df61d 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 @@ -93,7 +93,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 %} |