Browse Source

Fix enabled_drivers option

Upstream commit https://review.openstack.org/#/c/446925 removes
enabled_drivers option from ::ironic class, now we need to use
it from ::ironic::conductor class.

Change-Id: I1e49d6777de73a9c0267a7c982cb19253bb40e64
Closes-Bug: #1675684
Mykyta Karpin 2 years ago
parent
commit
b5a316b5d6

+ 1
- 1
deployment/puppet/openstack_tasks/manifests/roles/ironic_conductor.pp View File

@@ -92,7 +92,6 @@ class openstack_tasks::roles::ironic_conductor {
92 92
 
93 93
   class { '::ironic':
94 94
     debug                 => $debug,
95
-    enabled_drivers       => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'],
96 95
     default_transport_url => $transport_url,
97 96
     amqp_durable_queues   => $amqp_durable_queues,
98 97
     control_exchange      => 'ironic',
@@ -109,6 +108,7 @@ class openstack_tasks::roles::ironic_conductor {
109 108
 
110 109
   class { '::ironic::conductor':
111 110
     api_url            => "http://${baremetal_vip}:6385",
111
+    enabled_drivers    => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'],
112 112
     swift_temp_url_key => $ironic_swift_tempurl_key,
113 113
   }
114 114
 

+ 2
- 2
tests/noop/spec/hosts/roles/ironic-conductor_spec.rb View File

@@ -28,7 +28,6 @@ describe manifest do
28 28
       it 'should declare ironic class correctly' do
29 29
         should contain_class('ironic').with(
30 30
           'default_transport_url' => transport_url,
31
-          'enabled_drivers'       => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'],
32 31
           'control_exchange'      => 'ironic',
33 32
           'amqp_durable_queues'   => amqp_durable_queues,
34 33
           'database_max_retries'  => '-1',
@@ -39,7 +38,8 @@ describe manifest do
39 38
 
40 39
       it 'should declare ironic::conductor class correctly' do
41 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 44
       end
45 45
 

Loading…
Cancel
Save