Service_token_roles_required missing in the server config file
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. Change-Id: I4a7b2b79527543d96a8967a792e11870100ad1c3 Closes-Bug: 1778198
This commit is contained in:
		| @@ -160,6 +160,12 @@ | |||||||
| #   (in seconds). Set to -1 to disable caching completely. Integer value | #   (in seconds). Set to -1 to disable caching completely. Integer value | ||||||
| #   Defaults to $::os_service_default. | #   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 | # DEPRECATED PARAMETERS | ||||||
| # | # | ||||||
| # [*check_revocations_for_cached*] | # [*check_revocations_for_cached*] | ||||||
| @@ -212,6 +218,7 @@ class cloudkitty::keystone::authtoken( | |||||||
|   $manage_memcache_package        = false, |   $manage_memcache_package        = false, | ||||||
|   $region_name                    = $::os_service_default, |   $region_name                    = $::os_service_default, | ||||||
|   $token_cache_time               = $::os_service_default, |   $token_cache_time               = $::os_service_default, | ||||||
|  |   $service_token_roles_required   = $::os_service_default, | ||||||
|   # DEPRECATED PARAMETERS |   # DEPRECATED PARAMETERS | ||||||
|   $check_revocations_for_cached   = undef, |   $check_revocations_for_cached   = undef, | ||||||
|   $hash_algorithms                = undef, |   $hash_algorithms                = undef, | ||||||
| @@ -260,6 +267,7 @@ class cloudkitty::keystone::authtoken( | |||||||
|     manage_memcache_package        => $manage_memcache_package, |     manage_memcache_package        => $manage_memcache_package, | ||||||
|     region_name                    => $region_name, |     region_name                    => $region_name, | ||||||
|     token_cache_time               => $token_cache_time, |     token_cache_time               => $token_cache_time, | ||||||
|  |     service_token_roles_required   => $service_token_roles_required, | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -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. | ||||||
| @@ -42,6 +42,7 @@ describe 'cloudkitty::keystone::authtoken' do | |||||||
|         is_expected.to contain_cloudkitty_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>') |         is_expected.to contain_cloudkitty_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>') | ||||||
|         is_expected.to contain_cloudkitty_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>') |         is_expected.to contain_cloudkitty_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>') | ||||||
|         is_expected.to contain_cloudkitty_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>') |         is_expected.to contain_cloudkitty_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>') | ||||||
|  |         is_expected.to contain_cloudkitty_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>') | ||||||
|       end |       end | ||||||
|     end |     end | ||||||
|  |  | ||||||
| @@ -80,6 +81,7 @@ describe 'cloudkitty::keystone::authtoken' do | |||||||
|           :manage_memcache_package        => true, |           :manage_memcache_package        => true, | ||||||
|           :region_name                    => 'region2', |           :region_name                    => 'region2', | ||||||
|           :token_cache_time               => '301', |           :token_cache_time               => '301', | ||||||
|  |           :service_token_roles_required   => false, | ||||||
|         }) |         }) | ||||||
|       end |       end | ||||||
|  |  | ||||||
| @@ -115,6 +117,7 @@ describe 'cloudkitty::keystone::authtoken' do | |||||||
|         is_expected.to contain_cloudkitty_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211') |         is_expected.to contain_cloudkitty_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211') | ||||||
|         is_expected.to contain_cloudkitty_config('keystone_authtoken/region_name').with_value(params[:region_name]) |         is_expected.to contain_cloudkitty_config('keystone_authtoken/region_name').with_value(params[:region_name]) | ||||||
|         is_expected.to contain_cloudkitty_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) |         is_expected.to contain_cloudkitty_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) | ||||||
|  |         is_expected.to contain_cloudkitty_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required]) | ||||||
|       end |       end | ||||||
|  |  | ||||||
|       it 'installs python memcache package' do |       it 'installs python memcache package' do | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 ZhongShengping
					ZhongShengping