Merge "Always create ResellerAdmin role for Swift"

This commit is contained in:
Jenkins 2017-06-28 15:37:48 +00:00 committed by Gerrit Code Review
commit 1d152f7da2
2 changed files with 1 additions and 2 deletions
ansible/roles/swift

@ -42,5 +42,4 @@
auth: "{{ '{{ openstack_swift_auth }}' }}"
module_extra_vars:
openstack_swift_auth: "{{ openstack_swift_auth }}"
when: enable_ceilometer | bool
run_once: True

@ -48,7 +48,7 @@ memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansi
[filter:keystoneauth]
use = egg:swift#keystoneauth
operator_roles = admin,{{ keystone_default_user_role }}{% if enable_ceilometer | bool %},ResellerAdmin{% endif %}
operator_roles = admin,{{ keystone_default_user_role }},ResellerAdmin
{% if enable_ceilometer | bool %}
[filter:ceilometer]