openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove _member_ role from the keystone accepted roles"

Browse Source
This commit is contained in:
Zuul 2018-01-06 06:38:34 +00:00 committed by Gerrit Code Review
commit f9d9919e5d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/services/ceph-ansible/ceph-base.yaml
View File

@ -298,7 +298,7 @@ outputs:
osd_pool_default_pgp_num: {get_param: CephPoolDefaultPgNum} osd_pool_default_pgp_num: {get_param: CephPoolDefaultPgNum}
rgw_keystone_api_version: 3 rgw_keystone_api_version: 3
rgw_keystone_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} rgw_keystone_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
rgw_keystone_accepted_roles: 'Member, _member_, admin' rgw_keystone_accepted_roles: 'Member, admin'
rgw_keystone_admin_domain: default rgw_keystone_admin_domain: default
rgw_keystone_admin_project: service rgw_keystone_admin_project: service
rgw_keystone_admin_user: swift rgw_keystone_admin_user: swift

2
docker/services/ceph-ansible/ceph-rgw.yaml
View File

@ -80,7 +80,7 @@ outputs:
ceph::rgw::keystone::auth::internal_url: {get_param: [EndpointMap, CephRgwInternal, uri]} ceph::rgw::keystone::auth::internal_url: {get_param: [EndpointMap, CephRgwInternal, uri]}
ceph::rgw::keystone::auth::admin_url: {get_param: [EndpointMap, CephRgwAdmin, uri]} ceph::rgw::keystone::auth::admin_url: {get_param: [EndpointMap, CephRgwAdmin, uri]}
ceph::rgw::keystone::auth::region: {get_param: KeystoneRegion} ceph::rgw::keystone::auth::region: {get_param: KeystoneRegion}
ceph::rgw::keystone::auth::roles: [ 'admin', 'Member', '_member_' ] ceph::rgw::keystone::auth::roles: [ 'admin', 'Member' ]
ceph::rgw::keystone::auth::tenant: service ceph::rgw::keystone::auth::tenant: service
ceph::rgw::keystone::auth::user: swift ceph::rgw::keystone::auth::user: swift
ceph::rgw::keystone::auth::password: {get_param: SwiftPassword} ceph::rgw::keystone::auth::password: {get_param: SwiftPassword}

2
puppet/services/ceph-rgw.yaml
View File

@ -88,7 +88,7 @@ outputs:
ceph::rgw::keystone::auth::internal_url: {get_param: [EndpointMap, CephRgwInternal, uri]} ceph::rgw::keystone::auth::internal_url: {get_param: [EndpointMap, CephRgwInternal, uri]}
ceph::rgw::keystone::auth::admin_url: {get_param: [EndpointMap, CephRgwAdmin, uri]} ceph::rgw::keystone::auth::admin_url: {get_param: [EndpointMap, CephRgwAdmin, uri]}
ceph::rgw::keystone::auth::region: {get_param: KeystoneRegion} ceph::rgw::keystone::auth::region: {get_param: KeystoneRegion}
ceph::rgw::keystone::auth::roles: [ 'admin', 'Member', '_member_' ] ceph::rgw::keystone::auth::roles: [ 'admin', 'Member' ]
ceph::rgw::keystone::auth::tenant: service ceph::rgw::keystone::auth::tenant: service
ceph::rgw::keystone::auth::user: swift ceph::rgw::keystone::auth::user: swift
ceph::rgw::keystone::auth::password: {get_param: SwiftPassword} ceph::rgw::keystone::auth::password: {get_param: SwiftPassword}