From d1784538e655d602f692e2ce90630236406d89ba Mon Sep 17 00:00:00 2001 From: yatin Date: Wed, 13 Jun 2018 12:18:55 +0530 Subject: [PATCH] Don't enable 'fake' driver, instead use hardware-type Ironic removed the 'fake' drivers in [1], this patch removes it setup in poi, instead set fake-hardware in enabled_hardware_types. Also add other ironic, tempest config required by fake-hardware type. [1] https://review.openstack.org/#/c/572454/ Depends-On: I47e886f67e51edf8f4cee3ded44496287d2298d4 Change-Id: I7ea51b6bcee0a93dda7ff54fd3388469d14a9ba8 --- manifests/ironic.pp | 9 ++++++++- manifests/tempest.pp | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/manifests/ironic.pp b/manifests/ironic.pp index 849f575eb..a2fdac337 100644 --- a/manifests/ironic.pp +++ b/manifests/ironic.pp @@ -62,7 +62,14 @@ class openstack_integration::ironic { workers => 2, } class { '::ironic::conductor': - enabled_drivers => ['fake', 'pxe_ipmitool'], + enabled_hardware_types => ['fake-hardware', 'ipmi'], + } + class { '::ironic::drivers::interfaces': + enabled_management_interfaces => ['fake', 'ipmitool'], + enabled_boot_interfaces => ['fake', 'pxe'], + enabled_deploy_interfaces => ['fake', 'iscsi', 'direct'], + enabled_power_interfaces => ['fake', 'ipmitool'], + enabled_vendor_interfaces => ['fake', 'ipmitool', 'no-vendor'], } class { '::ironic::drivers::ipmi': } Rabbitmq_user_permissions['ironic@/'] -> Service<| tag == 'ironic-service' |> diff --git a/manifests/tempest.pp b/manifests/tempest.pp index 2bf8c9021..4e007f933 100644 --- a/manifests/tempest.pp +++ b/manifests/tempest.pp @@ -262,6 +262,8 @@ class openstack_integration::tempest ( # and 2/ if running in the gate, use /home/jenkins/cache/files/ cirros image. # img_dir => '/home/jenkins/cache/files', img_dir => '/tmp/openstack/image', + baremetal_driver => 'fake-hardware', + baremetal_enabled_hardware_types => 'ipmi,fake-hardware', } }