openstack
/
puppet-ceph
Code Issues Proposed changes

Remove _member_ role from the keystone accepted roles 

As per the development mailing list: Keystone removed _member_ role management

Change-Id: I9e3179e6e578002df0a8eec79fa5a58bf9d3d4c4
This commit is contained in:
Keith Schincke 2017-12-27 12:36:34 -05:00
parent 04d1a0438c
commit fbb6b1ce97
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/rgw/keystone.pp
View File

@ -34,7 +34,7 @@
# Optional. Default is 'v2.0'
#
# [*rgw_keystone_accepted_roles*] Roles to accept from keystone.
# Optional. Default is '_member_, Member'.
# Optional. Default is 'Member'.
# Comma separated list of roles.
#
# [*rgw_keystone_token_cache_size*] How many tokens to keep cached.
@ -76,7 +76,7 @@ define ceph::rgw::keystone (
$rgw_keystone_admin_token = undef,
$rgw_keystone_url = 'http://127.0.0.1:5000',
$rgw_keystone_version = 'v2.0',
$rgw_keystone_accepted_roles = '_member_, Member',
$rgw_keystone_accepted_roles = 'Member',
$rgw_keystone_token_cache_size = 500,
$rgw_s3_auth_use_keystone = true,
$use_pki = true,

4
spec/defines/ceph_rgw_keystone_spec.rb
View File

@ -62,7 +62,7 @@ describe 'ceph::rgw::keystone' do
it { is_expected.to contain_ceph_config('client.radosgw.gateway/rgw_keystone_url').with_value('http://keystone.default:5000') }
it { is_expected.to contain_ceph_config('client.radosgw.gateway/rgw_keystone_admin_token').with_value('defaulttoken') }
it { is_expected.to contain_ceph_config('client.radosgw.gateway/rgw_keystone_accepted_roles').with_value('_member_, Member') }
it { is_expected.to contain_ceph_config('client.radosgw.gateway/rgw_keystone_accepted_roles').with_value('Member') }
it { is_expected.to contain_ceph_config('client.radosgw.gateway/rgw_keystone_token_cache_size').with_value(500) }
it { is_expected.to contain_ceph_config('client.radosgw.gateway/rgw_s3_auth_use_keystone').with_value(true) }
it { is_expected.to contain_ceph_config('client.radosgw.gateway/rgw_keystone_revocation_interval').with_value(600) }
@ -222,7 +222,7 @@ wget --no-check-certificate http://keystone.custom:5000/v2.0/certificates/signin
it { is_expected.to contain_ceph_config('client.radosgw.gateway/rgw_keystone_url').with_value('http://keystone.default:5000') }
it { is_expected.to contain_ceph_config('client.radosgw.gateway/rgw_keystone_admin_token').with_value('defaulttoken') }
it { is_expected.to contain_ceph_config('client.radosgw.gateway/rgw_keystone_accepted_roles').with_value('_member_, Member') }
it { is_expected.to contain_ceph_config('client.radosgw.gateway/rgw_keystone_accepted_roles').with_value('Member') }
it { is_expected.to contain_ceph_config('client.radosgw.gateway/rgw_keystone_token_cache_size').with_value(500) }
it { is_expected.to contain_ceph_config('client.radosgw.gateway/rgw_s3_auth_use_keystone').with_value(true) }
it { is_expected.to contain_ceph_config('client.radosgw.gateway/rgw_keystone_revocation_interval').with_value(600) }