diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 4055ea926..aac6f9247 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -178,6 +178,12 @@ # (in seconds). Set to -1 to disable caching completely. Integer value # Defaults to $::os_service_default. # +# [*service_token_roles_required*] +# (optional) backwards compatibility to ensure that the service tokens are +# compared against a list of possible roles for validity +# true/false +# Defaults to $::os_service_default. +# # DEPRECATED PARAMETERS # # [*auth_uri*] @@ -219,6 +225,7 @@ class neutron::keystone::authtoken( $manage_memcache_package = false, $region_name = $::os_service_default, $token_cache_time = $::os_service_default, + $service_token_roles_required = $::os_service_default, # DEPRECATED PARAMETERS $auth_uri = undef, ) { @@ -269,5 +276,6 @@ class neutron::keystone::authtoken( manage_memcache_package => $manage_memcache_package, region_name => $region_name, token_cache_time => $token_cache_time, + service_token_roles_required => $service_token_roles_required, } } diff --git a/releasenotes/notes/service_token_roles_required-c07f2c2e0ed118c3.yaml b/releasenotes/notes/service_token_roles_required-c07f2c2e0ed118c3.yaml new file mode 100644 index 000000000..60a452172 --- /dev/null +++ b/releasenotes/notes/service_token_roles_required-c07f2c2e0ed118c3.yaml @@ -0,0 +1,5 @@ +--- +features: + - Service_token_roles_required missing in the server config file which + allows backwards compatibility to ensure that the service tokens are + compared against a list of possible roles for validity. diff --git a/spec/classes/neutron_keystone_authtoken_spec.rb b/spec/classes/neutron_keystone_authtoken_spec.rb index bda5c7cbf..373604ddb 100644 --- a/spec/classes/neutron_keystone_authtoken_spec.rb +++ b/spec/classes/neutron_keystone_authtoken_spec.rb @@ -44,6 +44,7 @@ describe 'neutron::keystone::authtoken' do is_expected.to contain_neutron_config('keystone_authtoken/memcached_servers').with_value('') is_expected.to contain_neutron_config('keystone_authtoken/region_name').with_value('') is_expected.to contain_neutron_config('keystone_authtoken/token_cache_time').with_value('') + is_expected.to contain_neutron_config('keystone_authtoken/service_token_roles_required').with_value('') end end @@ -84,6 +85,7 @@ describe 'neutron::keystone::authtoken' do :manage_memcache_package => true, :region_name => 'region2', :token_cache_time => '301', + :service_token_roles_required => false, }) end @@ -121,6 +123,7 @@ describe 'neutron::keystone::authtoken' do is_expected.to contain_neutron_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211') is_expected.to contain_neutron_config('keystone_authtoken/region_name').with_value(params[:region_name]) is_expected.to contain_neutron_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) + is_expected.to contain_neutron_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required]) end it 'installs python memcache package' do