Update ceph-rgw acccepted roles to fix OSP upgrade
authorKeith Schincke <keith.schincke@gmail.com>
Fri, 31 Mar 2017 12:59:47 +0000 (08:59 -0400)
committerGiulio Fidente <gfidente@redhat.com>
Tue, 11 Apr 2017 12:48:02 +0000 (14:48 +0200)
This patch updates ceph::keystone::auth::roles to remove
"member" and add "Member". The previous entry breaks
OSP N to O upgrades when ceph-rgw is enabled.

This patch fixes: https://bugs.launchpad.net/tripleo/+bug/1678126

Closes-bug: 1678126
(cherry picked from commit 4656323fc30e67f43d3dbd1ada42b608aa6f79e7)

Change-Id: I70e70f96c4aba2c89a9f81973f732d4348b91515

puppet/services/ceph-rgw.yaml

index 0153197..4985611 100644 (file)
@@ -73,7 +73,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', '_member_' ]
+          ceph::rgw::keystone::auth::roles: [ 'admin', 'Member', '_member_' ]
           ceph::rgw::keystone::auth::tenant: service
           ceph::rgw::keystone::auth::user: swift
           ceph::rgw::keystone::auth::password: {get_param: SwiftPassword}