diff --git a/manifests/init.pp b/manifests/init.pp index 063cbd5c..ecd256a2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -183,6 +183,8 @@ # Defaults to false # [*barbican_available*] # Defaults to false +# [*manila_available*] +# Defaults to false # [*cinder_enforce_scope*] # Defaults to $::os_service_default # [*glance_enforce_scope*] @@ -374,6 +376,7 @@ class tempest( $vitrage_available = false, $octavia_available = false, $barbican_available = false, + $manila_available = false, $cinder_enforce_scope = $::os_service_default, $glance_enforce_scope = $::os_service_default, $keystone_enforce_scope = $::os_service_default, @@ -572,6 +575,7 @@ class tempest( # TODO(tkajinam): Remove this after Zed release 'service_available/aodh_plugin': value => $::os_service_default; 'service_available/barbican': value => $barbican_available; + 'service_available/manila': value => $manila_available; 'service_available/bgpvpn': value => $neutron_bgpvpn_available; 'service_available/gnocchi': value => $gnocchi_available; 'service_available/designate': value => $designate_available; @@ -784,6 +788,13 @@ class tempest( tag => ['openstack', 'tempest-package'], } } + if $manila_available and $::tempest::params::python_manila_tests { + package { 'python-manila-tests-tempest': + ensure => present, + name => $::tempest::params::python_manila_tests, + tag => ['openstack', 'tempest-package'], + } + } } diff --git a/manifests/params.pp b/manifests/params.pp index b5f9e67d..1f328870 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -38,6 +38,7 @@ class tempest::params { $python_octavia_tests = 'python3-octavia-tests-tempest' $python_ec2api_tests = 'python3-ec2api-tests-tempest' $python_barbican_tests = 'python3-barbican-tests-tempest' + $python_manila_tests = 'python3-manila-tests-tempest' $package_name = 'openstack-tempest' } 'Debian': { @@ -77,6 +78,7 @@ class tempest::params { $python_octavia_tests = 'octavia-tempest-plugin' $python_ec2api_tests = false $python_barbican_tests = 'barbican-tempest-plugin' + $python_manila_tests = 'manila-tempest-plugin' $package_name = 'tempest' }else{ $python_telemetry_tests = false @@ -102,6 +104,7 @@ class tempest::params { $python_octavia_tests = false $python_ec2api_tests = false $python_barbican_tests = false + $python_manila_tests = false $package_name = 'tempest' } } diff --git a/releasenotes/notes/manila-opts-64b68b5682510f77.yaml b/releasenotes/notes/manila-opts-64b68b5682510f77.yaml new file mode 100644 index 00000000..80128ba3 --- /dev/null +++ b/releasenotes/notes/manila-opts-64b68b5682510f77.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + The new ``tempest::manila_available`` parameter has been added. This + parameter defaults to ``false``, but when set to ``true``, it installs + the ``manila-tempest-plugin`` package and enables the plugin tests. diff --git a/spec/classes/tempest_init_spec.rb b/spec/classes/tempest_init_spec.rb index 9ede2225..bf8b4426 100644 --- a/spec/classes/tempest_init_spec.rb +++ b/spec/classes/tempest_init_spec.rb @@ -272,6 +272,7 @@ describe 'tempest' do is_expected.to contain_tempest_config('service_available/designate').with(:value => false) is_expected.to contain_tempest_config('service_available/octavia').with(:value => false) is_expected.to contain_tempest_config('service_available/barbican').with(:value => false) + is_expected.to contain_tempest_config('service_available/manila').with(:value => false) is_expected.to contain_tempest_config('enforce_scope/cinder').with(:value => '') is_expected.to contain_tempest_config('enforce_scope/glance').with(:value => '') is_expected.to contain_tempest_config('enforce_scope/keystone').with(:value => '')