diff --git a/ansible/roles/ceilometer/tasks/register.yml b/ansible/roles/ceilometer/tasks/register.yml
index fa052f8861..f80d2ab8d1 100644
--- a/ansible/roles/ceilometer/tasks/register.yml
+++ b/ansible/roles/ceilometer/tasks/register.yml
@@ -42,5 +42,7 @@
       role: "ResellerAdmin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_ceilometer_auth }}' }}"
+    module_extra_vars:
+     openstack_ceilometer_auth: "{{ openstack_ceilometer_auth }}"
   when: enable_swift | bool
   run_once: True
diff --git a/ansible/roles/swift/tasks/register.yml b/ansible/roles/swift/tasks/register.yml
index e74717dffb..128311a349 100644
--- a/ansible/roles/swift/tasks/register.yml
+++ b/ansible/roles/swift/tasks/register.yml
@@ -37,9 +37,10 @@
   kolla_toolbox:
     module_name: "os_keystone_role"
     module_args:
-      project: "service"
-      role: "ResellerAdmin"
+      name: "ResellerAdmin"
       region_name: "{{ openstack_region_name }}"
       auth: "{{ '{{ openstack_swift_auth }}' }}"
+    module_extra_vars:
+      openstack_swift_auth: "{{ openstack_swift_auth }}"
   when: enable_ceilometer | bool
   run_once: True