diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-26 02:55:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-26 02:55:02 +0000 |
| commit | 56603d92ddf9e5e332a8c9861314e0c675d79ecd (patch) | |
| tree | 6391c005baf693d27cc8d417dc43830d602e6411 | |
| parent | cf17d234c8f6ca17fbcf6de325eff4f28f5363b1 (diff) | |
| parent | 36f400b80e2915dfe5fc92148bacf730a8f345be (diff) | |
| download | kolla-56603d92ddf9e5e332a8c9861314e0c675d79ecd.tar.gz kolla-56603d92ddf9e5e332a8c9861314e0c675d79ecd.zip | |
Merge "Fix heat role creation"
| -rw-r--r-- | ansible/roles/heat/tasks/register.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ansible/roles/heat/tasks/register.yml b/ansible/roles/heat/tasks/register.yml index 60112159c..70ee29f98 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 |