From fae4bdd453b887a68f5339f133d28762f9682460 Mon Sep 17 00:00:00 2001 From: yatin Date: Wed, 13 Jun 2018 17:10:41 +0530 Subject: [PATCH] Add options to configure tempest for ironic Change-Id: I47e886f67e51edf8f4cee3ded44496287d2298d4 --- manifests/init.pp | 9 +++++++++ .../add-ironic-tempest-options-787f5531b74fc625.yaml | 4 ++++ spec/classes/tempest_init_spec.rb | 2 ++ 3 files changed, 15 insertions(+) create mode 100644 releasenotes/notes/add-ironic-tempest-options-787f5531b74fc625.yaml diff --git a/manifests/init.pp b/manifests/init.pp index 7b592b4a..12ad0c2b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -209,6 +209,10 @@ # [*db_flavor_ref*] # Valid primary flavor to use in Trove tests. # Defaults to $::os_service_default +# [*baremetal_driver*] +# Defaults to 'fake' +# [*baremetal_enabled_hardware_types*] +# Defaults to 'ipmi' # # DEPREACTED PARAMETERS # [*tenant_name*] @@ -350,6 +354,9 @@ class tempest( $img_file = 'cirros-0.4.0-x86_64-disk.img', # designate options $designate_nameservers = undef, + # ironic options + $baremetal_driver = 'fake', + $baremetal_enabled_hardware_types = 'ipmi', # DEPRECATED PARAMETERS $tenant_name = undef, $alt_tenant_name = undef, @@ -563,6 +570,8 @@ class tempest( 'dns/nameservers': value => $designate_nameservers; 'compute-feature-enabled/attach_encrypted_volume': value => $attach_encrypted_volume; 'compute-feature-enabled/resize': value => $resize_available; + 'baremetal/driver': value => $baremetal_driver; + 'baremetal/enabled_hardware_types': value => $baremetal_enabled_hardware_types; } oslo::concurrency { 'tempest_config': lock_path => $lock_path } diff --git a/releasenotes/notes/add-ironic-tempest-options-787f5531b74fc625.yaml b/releasenotes/notes/add-ironic-tempest-options-787f5531b74fc625.yaml new file mode 100644 index 00000000..b4deb5ae --- /dev/null +++ b/releasenotes/notes/add-ironic-tempest-options-787f5531b74fc625.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Add some options to configure tempest for ironic. diff --git a/spec/classes/tempest_init_spec.rb b/spec/classes/tempest_init_spec.rb index 65e1d0d4..c04729c4 100644 --- a/spec/classes/tempest_init_spec.rb +++ b/spec/classes/tempest_init_spec.rb @@ -215,6 +215,8 @@ describe 'tempest' do is_expected.to contain_tempest_config('compute/build_interval').with(:value => nil) is_expected.to contain_tempest_config('compute-feature-enabled/attach_encrypted_volume').with(:value => false) is_expected.to contain_tempest_config('compute-feature-enabled/resize').with(:value => false) + is_expected.to contain_tempest_config('baremetal/driver').with(:value => 'fake') + is_expected.to contain_tempest_config('baremetal/enabled_hardware_types').with(:value => 'ipmi') is_expected.to contain_tempest_config('validation/image_ssh_user').with(:value => nil) is_expected.to contain_tempest_config('validation/run_validation').with(:value => false) is_expected.to contain_tempest_config('identity/admin_role').with(:value => nil)