ceph-rgw role changes roles list and breaks upgrades

[Keith Schincke]

Description
=================
tht patch (1) uses 'member' in the list of accepted roles. The previous OSP release N populates 'Member' as a keystone role. OSP N to OSP O upgrades fail due to keystone having a name collision.

1: https://github.com/openstack/tripleo-heat-templates/commit/3330089a739e45fce64bd0986281f00661eaf49c

Steps to reproduce
=================
1) deploy OSP N using RGW as the swift provider
2) upgrade to OSP O using OSP as the swift provider

Expected result
=================
A successful upgrade

Actual result
=================
OSP overcloud upgrade fails with the puppet-ceph failing to add the new role. Log link is below.

Environment
=================
 - OSPd 10 deployed
 - OSP overcloud deployed using ceph-rgw
 - OSPd upgraded to 11
 - OSP overcloud upgrade attempted

Logs & Configs:
=================
Error log: http://paste.openstack.org/show/604348/

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/452197
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=4656323fc30e67f43d3dbd1ada42b608aa6f79e7
Submitter: Jenkins
Branch: master

commit 4656323fc30e67f43d3dbd1ada42b608aa6f79e7
Author: Keith Schincke <email address hidden>
Date: Fri Mar 31 08:59:47 2017 -0400

    Update ceph-rgw acccepted roles to fix OSP upgrade

    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
    Change-Id: I2e442eda98e2e083d6f4193fb38a0484919a6d33

[OpenStack Infra (hudson-openstack)]

Change abandoned by Keith Schincke (<email address hidden>) on branch: stable/ocata
Review: https://review.openstack.org/452250
Reason: wrong cherry-pick

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 7.0.0.0b1 development milestone.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/ocata
Review: https://review.openstack.org/455695

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/455695
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=16de97f21660c66e64351d2a3122beeeeeb02f5a
Submitter: Jenkins
Branch: stable/ocata

commit 16de97f21660c66e64351d2a3122beeeeeb02f5a
Author: Keith Schincke <email address hidden>
Date: Fri Mar 31 08:59:47 2017 -0400

    Update ceph-rgw acccepted roles to fix OSP upgrade

    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

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 6.1.0 release.