From 36f400b80e2915dfe5fc92148bacf730a8f345be Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez <dabarren@gmail.com>
Date: Fri, 23 Sep 2016 15:23:56 +0200
Subject: [PATCH] Fix heat role creation
Change-Id: Ic2a14659f90e5b6060eb695e1f3592db3ae5b907
Closes-Bug: #1626863
---
ansible/roles/heat/tasks/register.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/ansible/roles/heat/tasks/register.yml b/ansible/roles/heat/tasks/register.yml
index 60112159c7..70ee29f981 100644
--- a/ansible/roles/heat/tasks/register.yml
+++ b/ansible/roles/heat/tasks/register.yml
@@ -47,10 +47,10 @@
-m os_keystone_role
-a "name={{ heat_stack_user_role }}
auth={{ '{{ openstack_heat_auth }}' }}"
- -e "{'openstack_horizon_auth':{{ openstack_heat_auth }}}"
+ -e "{'openstack_heat_auth':{{ openstack_heat_auth }}}"
register: heat_stack_user_role_result
- changed_when: "{{ heat_stack_user_result.stdout.find('localhost | SUCCESS => ') != -1 and (heat_stack_user_result.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
- until: heat_stack_user_result.split()[2] == 'SUCCESS'
+ changed_when: "{{ heat_stack_user_role_result.stdout.find('localhost | SUCCESS => ') != -1 and (heat_stack_user_role_result.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
+ until: heat_stack_user_role_result.stdout.split()[2] == 'SUCCESS'
retries: 10
delay: 5
run_once: True
@@ -60,10 +60,10 @@
-m os_keystone_role
-a "name={{ heat_stack_owner_role }}
auth={{ '{{ openstack_heat_auth }}' }}"
- -e "{'openstack_horizon_auth':{{ openstack_heat_auth }}}"
+ -e "{'openstack_heat_auth':{{ openstack_heat_auth }}}"
register: heat_stack_owner_role_result
- changed_when: "{{ heat_stack_owner_result.stdout.find('localhost | SUCCESS => ') != -1 and (heat_stack_owner_result.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
- until: heat_stack_owner_result.split()[2] == 'SUCCESS'
+ changed_when: "{{ heat_stack_owner_role_result.stdout.find('localhost | SUCCESS => ') != -1 and (heat_stack_owner_role_result.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
+ until: heat_stack_owner_role_result.stdout.split()[2] == 'SUCCESS'
retries: 10
delay: 5
run_once: True
--
GitLab