Remove Member role

In OpenStack deployment we more commonly use `member` than `Member`.
Also the `member` role is now implied by the `admin` role.

This removes the Member role to get rid of the unused role and follow
the standard roles.

Change-Id: I64175a3d485358af9a012060826dcedbe24b1042
This commit is contained in:
Takashi Kajinami 2023-07-30 00:20:01 +09:00
parent f5c1cf3ad5
commit b3a8ac1f0a
3 changed files with 10 additions and 6 deletions

View File

@ -18,7 +18,7 @@
#
# [*roles*]
# Accepted RGW roles. Optional.
# Defaults to ['admin', 'Member']
# Defaults to ['admin']
#
# [*public_url*]
# The public URL. Optional.
@ -62,7 +62,7 @@ class ceph::rgw::keystone::auth (
$password = $ceph::profile::params::rgw_keystone_admin_password,
$user = $ceph::profile::params::rgw_keystone_admin_user,
$email = 'rgwuser@localhost',
$roles = ['admin', 'Member'],
$roles = ['admin'],
$public_url = 'http://127.0.0.1:8080/swift/v1',
$admin_url = 'http://127.0.0.1:8080/swift/v1',
$internal_url = 'http://127.0.0.1:8080/swift/v1',

View File

@ -0,0 +1,7 @@
---
upgrade:
- |
The default value of the ``ceph::keystone::auth::roles`` parameter has
been updated and the new default does not contain the ``Member`` role,
because in OpenStack the ``member`` role is more commonly used, which is
now implied by the ``admin`` role.

View File

@ -31,12 +31,9 @@ describe 'ceph::rgw::keystone::auth' do
should contain_keystone_role('admin').with(
:ensure => 'present',
)
should contain_keystone_role('Member').with(
:ensure => 'present',
)
should contain_keystone_user_role('rgw_user@services').with(
:ensure => 'present',
:roles => ['admin', 'Member'],
:roles => ['admin'],
)
}
end