From 7d56985fa3342abb9c6d8bd3e6ade3f8f3c065f1 Mon Sep 17 00:00:00 2001
From: ramishra <ramishra@redhat.com>
Date: Wed, 24 Feb 2021 14:43:49 +0530
Subject: [PATCH] Don't try creating default admin and member roles

These are default roles and we don't need to create them for
ceph. Also swift user does not need admin role.

Closes-Bug: 1916756
Resolves: rhbz#1932208

Change-Id: I4d4c01d4ace8c51ae9f47f4dafd76bb3b5ed674f
(cherry picked from commit c1462b7608be9c7b925009ec95c9bbed0c08d98c)
(cherry picked from commit bd5e2c80fd7bfac2eb72c6c87557f64885648e53)
(cherry picked from commit 6de73eca77ae3650985e0b5d0d7d6c42562f1e6c)
---
 deployment/ceph-ansible/ceph-rgw.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/deployment/ceph-ansible/ceph-rgw.yaml b/deployment/ceph-ansible/ceph-rgw.yaml
index ceb080daf3..544f270e3e 100644
--- a/deployment/ceph-ansible/ceph-rgw.yaml
+++ b/deployment/ceph-ansible/ceph-rgw.yaml
@@ -122,13 +122,9 @@ outputs:
           users:
             swift:
               password: {get_param: SwiftPassword}
-              roles:
-                - admin
-                - member
           region: {get_param: KeystoneRegion}
           service: 'object-store'
           roles:
-            - member
             - ResellerAdmin
             - swiftoperator
       upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}