Always setup ResellerAdmin role in keystone

The ResellerAdmin role should be setup in keystone regardless of whether
we are using Ceilometer or not. This will allow operators to add the
ResellerAdmin role to users - which should then be allowed to operate on
any account.

Change-Id: I3c5ede01266b126705b42b086107a9232a85bf94
Closes-Bug: #1633221

tasks/swift_service_setup.yml

@@ -104,13 +104,12 @@
     login_user: "{{ keystone_admin_user_name }}"
     login_password: "{{ keystone_auth_admin_password }}"
     login_project_name: "{{ keystone_admin_tenant_name }}"
-    role_name: "ResellerAdmin"
+    role_name: "{{ swift_reselleradmin_role }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: add_role
   until: add_role|success
   retries: 5
   delay: 10
-  when: swift_ceilometer_enabled | bool
 
 - name: "Add ResellerAdmin role to the service tenant and ceilometer user"
   keystone:

tests/test-swift-functional.yml

@@ -35,7 +35,6 @@
       role_name: "{{ item }}"
       insecure: "{{ keystone_service_adminuri_insecure }}"
     with_items:
-      - "ResellerAdmin"
       - "test-role"
       - "test5"
     run_once: true