Merge "Add ResellerAdmin role for ceph-rgw"

ansible/roles/ceph/tasks/start_rgw_keystone.yml

@@ -30,3 +30,13 @@
       auth: "{{ openstack_ceph_rgw_auth }}"
       endpoint_type: "{{ openstack_interface }}"
   run_once: True
+
+- name: Creating the ResellerAdmin role
+  kolla_toolbox:
+    module_name: "os_keystone_role"
+    module_args:
+      name: "ResellerAdmin"
+      region_name: "{{ openstack_region_name }}"
+      auth: "{{ openstack_ceph_rgw_auth }}"
+      endpoint_type: "{{ openstack_interface }}"
+  run_once: True

ansible/roles/ceph/templates/ceph.conf.j2

@@ -40,6 +40,7 @@ rgw_keystone_admin_project = service
 rgw_keystone_admin_domain = default
 rgw_keystone_api_version = 3
 rgw_keystone_accepted_roles = admin, {{ keystone_default_user_role }}
+rgw_keystone_accepted_admin_roles = ResellerAdmin
 rgw_swift_versioning_enabled = true
 {% endif %}
 keyring = /etc/ceph/ceph.client.radosgw.keyring