openstack/puppet-tempest
Code Issues Proposed changes

Update option to scope enforcement tests in Barbican

Browse Source 
The option was renamed in barbican-tempest-plugin.

Depends-on: https://review.opendev.org/902293
Change-Id: I0ee885c3e429789cb606b02cf3c98a8c649e1e11
This commit is contained in:
Takashi Kajinami 2024-02-10 01:16:50 +09:00
parent ac0520fc45
commit 64029ed7de
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/init.pp
View File

@ -677,7 +677,7 @@ class tempest(
'service_available/zaqar': value => $zaqar_available; 'service_available/zaqar': value => $zaqar_available;
'service_available/ec2api': value => $ec2api_available; 'service_available/ec2api': value => $ec2api_available;
'service_available/octavia': value => $octavia_available; 'service_available/octavia': value => $octavia_available;
'barbican_rbac_scope_verification/enforce_scope': value => $barbican_enforce_scope; 'enforce_scope/barbican': value => $barbican_enforce_scope;
'enforce_scope/cinder': value => $cinder_enforce_scope; 'enforce_scope/cinder': value => $cinder_enforce_scope;
'enforce_scope/designate': value => $designate_enforce_scope; 'enforce_scope/designate': value => $designate_enforce_scope;
'enforce_scope/glance': value => $glance_enforce_scope; 'enforce_scope/glance': value => $glance_enforce_scope;
@ -737,6 +737,11 @@ class tempest(
'share/capability_storage_protocol': value => $share_capability_storage_protocol; 'share/capability_storage_protocol': value => $share_capability_storage_protocol;
} }
# TODO(tkajinam): Remove this after 2024.1 release
tempest_config {
'barbican_rbac_scope_verification/enforce_scope': ensure => absent;
}
oslo::concurrency { 'tempest_config': lock_path => $lock_path } oslo::concurrency { 'tempest_config': lock_path => $lock_path }
oslo::log { 'tempest_config': oslo::log { 'tempest_config':

2
spec/classes/tempest_init_spec.rb
View File

@ -320,7 +320,7 @@ describe 'tempest' do
is_expected.to contain_tempest_config('service_available/octavia').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/barbican').with(:value => false)
is_expected.to contain_tempest_config('service_available/manila').with(:value => false) is_expected.to contain_tempest_config('service_available/manila').with(:value => false)
is_expected.to contain_tempest_config('barbican_rbac_scope_verification/enforce_scope').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('enforce_scope/barbican').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('enforce_scope/cinder').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('enforce_scope/cinder').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('enforce_scope/glance').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('enforce_scope/glance').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('enforce_scope/keystone').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('enforce_scope/keystone').with(:value => '<SERVICE DEFAULT>')