From d9853851deefe51599372922433f36e2f31f0272 Mon Sep 17 00:00:00 2001 From: Maksym Yatsenko Date: Wed, 17 Aug 2016 12:18:09 +0300 Subject: [PATCH] Configure 'conductor/api_url' if its not defined in another place It's temporary solution to configure 'conductor/api_url' parameter via 'ironic_config' provider till it will be implemented in 'ironic::conductor' class of puppet-ironic project. Closes-Bug: #1613644 Change-Id: I27467942525956a8f9f29c055bc2046afe78f236 --- .../openstack_tasks/manifests/roles/ironic_conductor.pp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/deployment/puppet/openstack_tasks/manifests/roles/ironic_conductor.pp b/deployment/puppet/openstack_tasks/manifests/roles/ironic_conductor.pp index 56a14fa7f2..7ab179bc38 100644 --- a/deployment/puppet/openstack_tasks/manifests/roles/ironic_conductor.pp +++ b/deployment/puppet/openstack_tasks/manifests/roles/ironic_conductor.pp @@ -112,7 +112,12 @@ class openstack_tasks::roles::ironic_conductor { 'glance/swift_temp_url_key': value => $ironic_swift_tempurl_key; 'glance/swift_endpoint_url': value => "http://${baremetal_vip}:8080"; 'glance/temp_url_endpoint_type': value => $temp_url_endpoint_type; - 'conductor/api_url': value => "http://${baremetal_vip}:6385"; + } + + if !defined(Ironic_config['conductor/api_url']) { + ironic_config { 'conductor/api_url': value => "http://${baremetal_vip}:6385" } + } else { + Ironic_config<| title == 'conductor/api_url' |> { value => "http://${baremetal_vip}:6385" } } file { $tftp_root: