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]