openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Add swiftoperator role on ceph-rgw template 

When deploying an Overcloud with Swift a role named
swiftoperator is created.
This change make sure we have swiftoperator role
when Ceph Object Gateway is created as well (as it's
replacement for swift).

Change-Id: I80bd347c4210f9ee7f06febe26a130269ab56b85
(cherry picked from commit f0aaaed685)
This commit is contained in:
Francesco Pantano 2020-01-13 15:36:36 +01:00
parent 909d57ccc1
commit 0e27b004be
No known key found for this signature in database
GPG Key ID: 799868C47301D458
2 changed files with 2 additions and 2 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

@ -258,7 +258,7 @@ resources:
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, admin' rgw_keystone_accepted_roles: 'Member, admin'
rgw_keystone_accepted_admin_roles: ResellerAdmin rgw_keystone_accepted_admin_roles: ResellerAdmin, swiftoperator
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

@ -100,7 +100,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' ] ceph::rgw::keystone::auth::roles: [ 'admin', 'member', 'ResellerAdmin', 'swiftoperator' ]
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}