From 9e158b7887fe0ae5cc2996a6c7720a730bf20b3f Mon Sep 17 00:00:00 2001
From: shaofeng_cheng <chengsf@winhong.com>
Date: Wed, 17 May 2017 17:00:53 +0800
Subject: [PATCH] Fix create and associate error of resellerAdmin

Fix the following error:
openstack_swift_auth is undefined
unsupported parameter for module: project
unsupported parameter for module: role

Change-Id: Id60e3f06e90e708d9054b905bbfd28ff5450fa49
Closes-Bug: #1691388
---
 ansible/roles/ceilometer/tasks/register.yml | 2 ++
 ansible/roles/swift/tasks/register.yml      | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

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