diff --git a/manifests/init.pp b/manifests/init.pp index d4632b7b..8a888d3e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -171,6 +171,16 @@ # Defaults to false # [*barbican_available*] # Defaults to false +# [*cinder_enforce_scope*] +# Defaults to $::os_service_default +# [*glance_enforce_scope*] +# Defaults to $::os_service_default +# [*keystone_enforce_scope*] +# Defaults to $::os_service_default +# [*neutron_enforce_scope*] +# Defaults to $::os_service_default +# [*nova_enforce_scope*] +# Defaults to $::os_service_default # [*keystone_v3*] # Defaults to true # [*auth_version*] @@ -338,6 +348,11 @@ class tempest( $vitrage_available = false, $octavia_available = false, $barbican_available = false, + $cinder_enforce_scope = $::os_service_default, + $glance_enforce_scope = $::os_service_default, + $keystone_enforce_scope = $::os_service_default, + $neutron_enforce_scope = $::os_service_default, + $nova_enforce_scope = $::os_service_default, $keystone_v3 = true, $auth_version = 'v3', $run_service_broker_tests = false, @@ -576,6 +591,12 @@ class tempest( 'service_available/zaqar': value => $zaqar_available; 'service_available/ec2api': value => $ec2api_available; 'service_available/octavia': value => $octavia_available; + 'enforce_scope/cinder': value => $cinder_enforce_scope; + 'enforce_scope/glance': value => $glance_enforce_scope; + 'enforce_scope/keystone': value => $keystone_enforce_scope; + 'identity-feature-enabled/enforce_scope': value => $keystone_enforce_scope; + 'enforce_scope/neutron': value => $neutron_enforce_scope; + 'enforce_scope/nova': value => $nova_enforce_scope; 'whitebox/db_uri': value => $whitebox_db_uri; 'cli/cli_dir': value => $cli_dir; 'scenario/img_file': value => $img_file_real; diff --git a/releasenotes/notes/enforce_scope-fed80f6987016bb6.yaml b/releasenotes/notes/enforce_scope-fed80f6987016bb6.yaml new file mode 100644 index 00000000..0abbf903 --- /dev/null +++ b/releasenotes/notes/enforce_scope-fed80f6987016bb6.yaml @@ -0,0 +1,10 @@ +--- +features: + - | + The following parameters have been added to the ``tempest`` class. + + - ``cinder_enforce_scope`` + - ``glance_enforce_scope`` + - ``keystone_enforce_scope`` + - ``neutron_enforce_scope`` + - ``nova_enforce_scope`` diff --git a/spec/classes/tempest_init_spec.rb b/spec/classes/tempest_init_spec.rb index 874870a6..efde745d 100644 --- a/spec/classes/tempest_init_spec.rb +++ b/spec/classes/tempest_init_spec.rb @@ -269,6 +269,12 @@ 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('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 => '') + is_expected.to contain_tempest_config('identity-feature-enabled/enforce_scope').with(:value => '') + is_expected.to contain_tempest_config('enforce_scope/neutron').with(:value => '') + is_expected.to contain_tempest_config('enforce_scope/nova').with(:value => '') is_expected.to contain_tempest_config('whitebox/db_uri').with(:value => nil) is_expected.to contain_tempest_config('cli/cli_dir').with(:value => nil) is_expected.to contain_oslo__concurrency('tempest_config').with(