From 0ffa770b836a89f3a6d24cad66a499e82a264f63 Mon Sep 17 00:00:00 2001
From: Vladislav Belogrudov <vladislav.belogrudov@oracle.com>
Date: Tue, 27 Jun 2017 12:34:15 +0300
Subject: [PATCH] Always create ResellerAdmin role for Swift

ResellerAdmin role should be created always when Swift is enabled
and not only for Ceilometer. The role is needed for normal users
to get administration rights for their Swift projects and is
required to pass DefCore (OpenStack Powered) certification.

Change-Id: I4faa63b8fae1814e382de2794301248cc0f4a90a
Closes-Bug: #1700729
---
 ansible/roles/swift/tasks/register.yml             | 1 -
 ansible/roles/swift/templates/proxy-server.conf.j2 | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ansible/roles/swift/tasks/register.yml b/ansible/roles/swift/tasks/register.yml
index 128311a349..714ba9965a 100644
--- a/ansible/roles/swift/tasks/register.yml
+++ b/ansible/roles/swift/tasks/register.yml
@@ -42,5 +42,4 @@
       auth: "{{ '{{ openstack_swift_auth }}' }}"
     module_extra_vars:
       openstack_swift_auth: "{{ openstack_swift_auth }}"
-  when: enable_ceilometer | bool
   run_once: True
diff --git a/ansible/roles/swift/templates/proxy-server.conf.j2 b/ansible/roles/swift/templates/proxy-server.conf.j2
index 3f360d36b0..b4044155ec 100644
--- a/ansible/roles/swift/templates/proxy-server.conf.j2
+++ b/ansible/roles/swift/templates/proxy-server.conf.j2
@@ -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]