openstack/puppet-keystone
Code Issues Proposed changes

Support member_role_id and member_role_name config options

Browse Source 
Change-Id: Id934a56e047baefe6f0c9a26c512f43fbdc793ae
This commit is contained in:
Sam Morrison 2016-06-28 16:36:15 +10:00
parent 7c34d6c6ff
commit 51c68fb127
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/init.pp
View File

@ -443,6 +443,18 @@
# qualification those resources goes into "Default" domain. See README. # qualification those resources goes into "Default" domain. See README.
# Defaults to undef (will use built-in Keystone default) # Defaults to undef (will use built-in Keystone default)
# #
# [*member_role_id*]
# (optional) # Similar to the member_role_name option, this represents the
# default role ID used to associate users with their default projects in the
# v2 API. This will be used as the explicit role where one is not specified
# by the v2 API.
# Defaults to $::os_service_default
#
# [*member_role_name*]
# (optional) # This is the role name used in combination with the
# member_role_id option; see that option for more detail.
# Defaults to $::os_service_default
#
# [*memcache_dead_retry*] # [*memcache_dead_retry*]
# (optional) Number of seconds memcached server is considered dead before it # (optional) Number of seconds memcached server is considered dead before it
# is tried again. This is used for the cache memcache_dead_retry and the # is tried again. This is used for the cache memcache_dead_retry and the
@ -658,6 +670,8 @@ class keystone(
$fernet_key_repository = '/etc/keystone/fernet-keys', $fernet_key_repository = '/etc/keystone/fernet-keys',
$fernet_max_active_keys = $::os_service_default, $fernet_max_active_keys = $::os_service_default,
$default_domain = undef, $default_domain = undef,
$member_role_id = $::os_service_default,
$member_role_name = $::os_service_default,
$enable_bootstrap = true, $enable_bootstrap = true,
$memcache_dead_retry = $::os_service_default, $memcache_dead_retry = $::os_service_default,
$memcache_socket_timeout = $::os_service_default, $memcache_socket_timeout = $::os_service_default,
@ -747,6 +761,8 @@ class keystone(
'DEFAULT/admin_bind_host': value => $admin_bind_host; 'DEFAULT/admin_bind_host': value => $admin_bind_host;
'DEFAULT/public_port': value => $public_port; 'DEFAULT/public_port': value => $public_port;
'DEFAULT/admin_port': value => $admin_port; 'DEFAULT/admin_port': value => $admin_port;
'DEFAULT/member_role_id': value => $member_role_id;
'DEFAULT/member_role_name': value => $member_role_name;
'paste_deploy/config_file': value => $paste_config; 'paste_deploy/config_file': value => $paste_config;
} }

6
spec/classes/keystone_spec.rb
View File

@ -64,6 +64,8 @@ describe 'keystone' do
'rabbit_heartbeat_rate' => '<SERVICE DEFAULT>', 'rabbit_heartbeat_rate' => '<SERVICE DEFAULT>',
'admin_workers' => 20, 'admin_workers' => 20,
'public_workers' => 20, 'public_workers' => 20,
'member_role_id' => '<SERVICE DEFAULT>',
'member_role_name' => '<SERVICE DEFAULT>',
'paste_config' => '<SERVICE DEFAULT>', 'paste_config' => '<SERVICE DEFAULT>',
'sync_db' => true, 'sync_db' => true,
'purge_config' => false, 'purge_config' => false,
@ -110,6 +112,8 @@ describe 'keystone' do
'rabbit_heartbeat_rate' => '10', 'rabbit_heartbeat_rate' => '10',
'rabbit_ha_queues' => true, 'rabbit_ha_queues' => true,
'default_domain' => 'other_domain', 'default_domain' => 'other_domain',
'member_role_id' => '123456789',
'member_role_name' => 'othermember',
'paste_config' => '/usr/share/keystone/keystone-paste.ini', 'paste_config' => '/usr/share/keystone/keystone-paste.ini',
'using_domain_config' => false 'using_domain_config' => false
} }
@ -165,6 +169,8 @@ describe 'keystone' do
'admin_bind_host', 'admin_bind_host',
'public_port', 'public_port',
'admin_port', 'admin_port',
'member_role_id',
'member_role_name',
'debug', 'debug',
'use_stderr' 'use_stderr'
].each do |config| ].each do |config|