Browse Source

Merge "Add swiftoperator role on ceph-rgw template" into stable/queens

changes/21/713121/1
Zuul 3 months ago
committed by Gerrit Code Review
parent
commit
d7cd9268df
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      docker/services/ceph-ansible/ceph-base.yaml
  2. +1
    -1
      docker/services/ceph-ansible/ceph-rgw.yaml

+ 1
- 1
docker/services/ceph-ansible/ceph-base.yaml View File

@@ -227,7 +227,7 @@ resources:
rgw_keystone_api_version: 3
rgw_keystone_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
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_project: service
rgw_keystone_admin_user: swift


+ 1
- 1
docker/services/ceph-ansible/ceph-rgw.yaml View File

@@ -133,7 +133,7 @@ outputs:
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::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::user: swift
ceph::rgw::keystone::auth::password: {get_param: SwiftPassword}

Loading…
Cancel
Save