From 45e96e5fa541f4dda37f3cd64559bbc7d786e6a1 Mon Sep 17 00:00:00 2001
From: Keith Schincke <keith.schincke@gmail.com>
Date: Wed, 27 Dec 2017 13:37:40 -0500
Subject: [PATCH] Remove _member_ role from the keystone accepted roles

As per the development mailing list: Keystone removed _member_ role management

Change-Id: I4f553431d1c38ca8d2c18a213d07f957c388d914
---
 docker/services/ceph-ansible/ceph-base.yaml | 2 +-
 docker/services/ceph-ansible/ceph-rgw.yaml  | 2 +-
 puppet/services/ceph-rgw.yaml               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml
index b46a09a13f..9efeb23372 100644
--- a/docker/services/ceph-ansible/ceph-base.yaml
+++ b/docker/services/ceph-ansible/ceph-base.yaml
@@ -298,7 +298,7 @@ outputs:
                   osd_pool_default_pgp_num: {get_param: CephPoolDefaultPgNum}
                   rgw_keystone_api_version: 3
                   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_project: service
                   rgw_keystone_admin_user: swift
diff --git a/docker/services/ceph-ansible/ceph-rgw.yaml b/docker/services/ceph-ansible/ceph-rgw.yaml
index a2eb06d515..5bbee3e0b0 100644
--- a/docker/services/ceph-ansible/ceph-rgw.yaml
+++ b/docker/services/ceph-ansible/ceph-rgw.yaml
@@ -80,7 +80,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' ]
           ceph::rgw::keystone::auth::tenant: service
           ceph::rgw::keystone::auth::user: swift
           ceph::rgw::keystone::auth::password: {get_param: SwiftPassword}
diff --git a/puppet/services/ceph-rgw.yaml b/puppet/services/ceph-rgw.yaml
index 9df00e1b49..d169e8e72a 100644
--- a/puppet/services/ceph-rgw.yaml
+++ b/puppet/services/ceph-rgw.yaml
@@ -88,7 +88,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' ]
           ceph::rgw::keystone::auth::tenant: service
           ceph::rgw::keystone::auth::user: swift
           ceph::rgw::keystone::auth::password: {get_param: SwiftPassword}