openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add ResellerAdmin role for ceph-rgw"

Browse Source
This commit is contained in:
Zuul 2018-08-09 09:54:08 +00:00 committed by Gerrit Code Review
commit f3e2ab217f
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ansible/roles/ceph/tasks/start_rgw_keystone.yml
View File

@ -30,3 +30,13 @@
auth: "{{ openstack_ceph_rgw_auth }}" auth: "{{ openstack_ceph_rgw_auth }}"
endpoint_type: "{{ openstack_interface }}" endpoint_type: "{{ openstack_interface }}"
run_once: True 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

1
ansible/roles/ceph/templates/ceph.conf.j2
View File

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