commit 500b1e54a51361f598add7068c827705f605277b
author mcp-jenkins <mcp-jenkins@mirantis.com> Mon Jan 14 20:30:56 2019 +0000
committer Gerrit Code Review <mail@domain.com> Mon Jan 14 20:30:56 2019 +0000
tree 71695bb3927764908fde85f1c6a29267ad84d5ca
parent 7612141be988db5fd93120b34299c42090ac5d79
parent c1d38f91c20c703e543ca5c83d11f63ba789f8aa

Merge "Fix typos in reclass for image_layout backends"

keystone/client/service/radosgw-swift.yml

diff --git a/keystone/client/service/radosgw-swift.yml b/keystone/client/service/radosgw-swift.yml
index 5dc4c3b..e3f8157 100644
--- a/keystone/client/service/radosgw-swift.yml
+++ b/keystone/client/service/radosgw-swift.yml
@@ -8,6 +8,8 @@
     client:
       server:
         identity:
+          roles:
+          - ResellerAdmin
           project:
             service:
               user:
@@ -15,6 +17,11 @@
                   is_admin: true
                   password: ${_param:keystone_swift_password}
                   email: ${_param:admin_email}
+            admin:
+              user:
+                admin:
+                  roles:
+                  - ResellerAdmin
           service:
             radosgw-swift:
               type: object-store

keystone/client/v3/service/radosgw-swift.yml

diff --git a/keystone/client/v3/service/radosgw-swift.yml b/keystone/client/v3/service/radosgw-swift.yml
index 4452e0f..b9fadc8 100644
--- a/keystone/client/v3/service/radosgw-swift.yml
+++ b/keystone/client/v3/service/radosgw-swift.yml
@@ -6,6 +6,10 @@
     client:
       resources:
         v3:
+          roles:
+            reseller_admin:
+              name: ResellerAdmin
+              enabled: true
           users:
             swift:
               password: ${_param:keystone_swift_password}
@@ -14,6 +18,11 @@
                 service_admin:
                   name: admin
                   project_id: service
+            admin:
+              roles:
+                reseller_admin:
+                  name: ResellerAdmin
+                  project_id: admin
           services:
             radosgw-swift:
               type: object-store