openstack
/
kolla
Code Issues Proposed changes

Merge "Fix heat role creation"

This commit is contained in:
Jenkins 2016-09-26 02:55:02 +00:00 committed by Gerrit Code Review
parent cf17d234c8 36f400b80e
commit 56603d92dd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ansible/roles/heat/tasks/register.yml
View File

@ -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