openstack
/
puppet-ceph
Code Issues Proposed changes

Merge "Change Keystone RGW default role from Member to member"

This commit is contained in:
Zuul 2019-02-27 10:45:16 +00:00 committed by Gerrit Code Review
parent 678c48a065 3fe321fdc0
commit b51e5cb05c
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/rgw/keystone.pp
View File

@ -45,7 +45,7 @@
# [*rgw_keystone_accepted_roles*]
# (Optional) Roles to accept from keystone.
# Comma separated list of roles.
# Defaults to 'Member'
# Defaults to 'member'
#
# [*rgw_keystone_token_cache_size*]
# (Optional) How many tokens to keep cached.
@ -92,7 +92,7 @@ define ceph::rgw::keystone (
$rgw_keystone_admin_user,
$rgw_keystone_admin_password,
$rgw_keystone_url = 'http://127.0.0.1:5000',
$rgw_keystone_accepted_roles = 'Member',
$rgw_keystone_accepted_roles = 'member',
$rgw_keystone_token_cache_size = 500,
$rgw_s3_auth_use_keystone = true,
$rgw_keystone_implicit_tenants = true,

5
releasenotes/notes/keystone-rgw-default-role-01c22244b6340a32.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The default value for ceph::rgw::keystone::rgw_keystone_accepted_roles is
changed from Member to member

2
spec/defines/ceph_rgw_keystone_spec.rb
View File

@ -49,7 +49,7 @@ describe 'ceph::rgw::keystone' do
it { should contain_ceph_config('client.radosgw.gateway/rgw_keystone_admin_password').with_value('123456') }
it { should contain_ceph_config('client.radosgw.gateway/rgw_keystone_admin_token').with_ensure('absent') }
it { should contain_ceph_config('client.radosgw.gateway/rgw_keystone_url').with_value('http://127.0.0.1:5000') }
it { should contain_ceph_config('client.radosgw.gateway/rgw_keystone_accepted_roles').with_value('Member') }
it { should contain_ceph_config('client.radosgw.gateway/rgw_keystone_accepted_roles').with_value('member') }
it { should contain_ceph_config('client.radosgw.gateway/rgw_keystone_token_cache_size').with_value(500) }
it { should contain_ceph_config('client.radosgw.gateway/rgw_s3_auth_use_keystone').with_value(true) }
it { should contain_ceph_config('client.radosgw.gateway/rgw_keystone_implicit_tenants').with_value(true) }