openstack/puppet-openstack-integration
Code Issues Proposed changes

Don't enable 'fake' driver, instead use hardware-type

Browse Source 
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
This commit is contained in:
yatin 2018-06-13 12:18:55 +05:30
parent 11a5e5815f
commit d1784538e6
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/ironic.pp
View File

@ -62,7 +62,14 @@ class openstack_integration::ironic {
workers => 2, workers => 2,
} }
class { '::ironic::conductor': 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': } class { '::ironic::drivers::ipmi': }
Rabbitmq_user_permissions['ironic@/'] -> Service<| tag == 'ironic-service' |> Rabbitmq_user_permissions['ironic@/'] -> Service<| tag == 'ironic-service' |>

2
manifests/tempest.pp
View File

@ -262,6 +262,8 @@ class openstack_integration::tempest (
# and 2/ if running in the gate, use /home/jenkins/cache/files/ cirros image. # and 2/ if running in the gate, use /home/jenkins/cache/files/ cirros image.
# img_dir => '/home/jenkins/cache/files', # img_dir => '/home/jenkins/cache/files',
img_dir => '/tmp/openstack/image', img_dir => '/tmp/openstack/image',
baremetal_driver => 'fake-hardware',
baremetal_enabled_hardware_types => 'ipmi,fake-hardware',
} }
} }