summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-27 15:30:30 +0000
committerGerrit Code Review <review@openstack.org>2017-03-27 15:30:30 +0000
commit9b13f574eaac8d06cf0ec96651108edb49a7caa8 (patch)
tree85f36a33121e9ed4562a75bee84e8519846a0654
parentec5d01b6ad9c37c68f16f935ec1095c5de9d224a (diff)
parentb5a316b5d629e36761afb8745a00396b7a4bd0e1 (diff)
Merge "Fix enabled_drivers option"
-rw-r--r--deployment/puppet/openstack_tasks/manifests/roles/ironic_conductor.pp2
-rw-r--r--tests/noop/spec/hosts/roles/ironic-conductor_spec.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/deployment/puppet/openstack_tasks/manifests/roles/ironic_conductor.pp b/deployment/puppet/openstack_tasks/manifests/roles/ironic_conductor.pp
index 2f6dd04..348d763 100644
--- a/deployment/puppet/openstack_tasks/manifests/roles/ironic_conductor.pp
+++ b/deployment/puppet/openstack_tasks/manifests/roles/ironic_conductor.pp
@@ -92,7 +92,6 @@ class openstack_tasks::roles::ironic_conductor {
92 92
93 class { '::ironic': 93 class { '::ironic':
94 debug => $debug, 94 debug => $debug,
95 enabled_drivers => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'],
96 default_transport_url => $transport_url, 95 default_transport_url => $transport_url,
97 amqp_durable_queues => $amqp_durable_queues, 96 amqp_durable_queues => $amqp_durable_queues,
98 control_exchange => 'ironic', 97 control_exchange => 'ironic',
@@ -109,6 +108,7 @@ class openstack_tasks::roles::ironic_conductor {
109 108
110 class { '::ironic::conductor': 109 class { '::ironic::conductor':
111 api_url => "http://${baremetal_vip}:6385", 110 api_url => "http://${baremetal_vip}:6385",
111 enabled_drivers => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'],
112 swift_temp_url_key => $ironic_swift_tempurl_key, 112 swift_temp_url_key => $ironic_swift_tempurl_key,
113 } 113 }
114 114
diff --git a/tests/noop/spec/hosts/roles/ironic-conductor_spec.rb b/tests/noop/spec/hosts/roles/ironic-conductor_spec.rb
index 63beb5c..76ff8a6 100644
--- a/tests/noop/spec/hosts/roles/ironic-conductor_spec.rb
+++ b/tests/noop/spec/hosts/roles/ironic-conductor_spec.rb
@@ -28,7 +28,6 @@ describe manifest do
28 it 'should declare ironic class correctly' do 28 it 'should declare ironic class correctly' do
29 should contain_class('ironic').with( 29 should contain_class('ironic').with(
30 'default_transport_url' => transport_url, 30 'default_transport_url' => transport_url,
31 'enabled_drivers' => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'],
32 'control_exchange' => 'ironic', 31 'control_exchange' => 'ironic',
33 'amqp_durable_queues' => amqp_durable_queues, 32 'amqp_durable_queues' => amqp_durable_queues,
34 'database_max_retries' => '-1', 33 'database_max_retries' => '-1',
@@ -39,7 +38,8 @@ describe manifest do
39 38
40 it 'should declare ironic::conductor class correctly' do 39 it 'should declare ironic::conductor class correctly' do
41 should contain_class('ironic::conductor').with( 40 should contain_class('ironic::conductor').with(
42 'api_url' => "http://#{baremetal_vip}:6385", 41 'api_url' => "http://#{baremetal_vip}:6385",
42 'enabled_drivers' => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'],
43 ) 43 )
44 end 44 end
45 45