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

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 {
 
   class { '::ironic':
     debug                 => $debug,
-    enabled_drivers       => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'],
     default_transport_url => $transport_url,
     amqp_durable_queues   => $amqp_durable_queues,
     control_exchange      => 'ironic',
@@ -109,6 +108,7 @@ class openstack_tasks::roles::ironic_conductor {
 
   class { '::ironic::conductor':
     api_url            => "http://${baremetal_vip}:6385",
+    enabled_drivers    => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'],
     swift_temp_url_key => $ironic_swift_tempurl_key,
   }
 
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
       it 'should declare ironic class correctly' do
         should contain_class('ironic').with(
           'default_transport_url' => transport_url,
-          'enabled_drivers'       => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'],
           'control_exchange'      => 'ironic',
           'amqp_durable_queues'   => amqp_durable_queues,
           'database_max_retries'  => '-1',
@@ -39,7 +38,8 @@ describe manifest do
 
       it 'should declare ironic::conductor class correctly' do
         should contain_class('ironic::conductor').with(
-          'api_url' => "http://#{baremetal_vip}:6385",
+          'api_url'         => "http://#{baremetal_vip}:6385",
+          'enabled_drivers' => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'],
         )
       end