openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Don't set all_nodes data as group_vars in check mode 

Since the "render all_nodes data as group_vars" tasks are skipped when
ansible check is true, we should not run the "set all_nodes data as
group_vars" tasks as well. It was missed and now failing when --check is
used (see bug report).

Change-Id: I2852c8285a0e72d855bfed216b53de6bdeeabe68
Closes-Bug: #1854246
(cherry picked from commit 0362abcbd1)
This commit is contained in:
Emilien Macchi 2019-11-27 22:06:03 -05:00
parent 8343952564
commit 34ae01ddb2
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/deploy-steps.j2
View File

@ -448,6 +448,7 @@ outputs:
- name: Set all_nodes data as group_vars for overcloud
include_vars: "{{ '{{ ' }} playbook_dir {{ ' }}' }}/group_vars/overcloud.json"
no_log: true
when: not ansible_check_mode|bool
tags:
- facts
@ -925,6 +926,7 @@ outputs:
- name: Set all_nodes data as group_vars for overcloud
include_vars: "{{ '{{ ' }} playbook_dir {{ ' }}' }}/group_vars/overcloud.json"
no_log: true
when: not ansible_check_mode|bool
tags:
- facts
{%- for role in roles %}
@ -1033,6 +1035,7 @@ outputs:
- name: Set all_nodes data as group_vars for overcloud
include_vars: "{{ '{{ ' }} playbook_dir {{ ' }}' }}/group_vars/overcloud.json"
no_log: true
when: not ansible_check_mode|bool
tags:
- facts
{%- for step in range(external_update_steps_max) %}
@ -1141,6 +1144,7 @@ outputs:
- name: Set all_nodes data as group_vars for overcloud
include_vars: "{{ '{{ ' }} playbook_dir {{ ' }}' }}/group_vars/overcloud.json"
no_log: true
when: not ansible_check_mode|bool
tags:
- facts
- hosts: {{role.name}}
@ -1218,6 +1222,7 @@ outputs:
- name: Set all_nodes data as group_vars for overcloud
include_vars: "{{ '{{ ' }} playbook_dir {{ ' }}' }}/group_vars/overcloud.json"
no_log: true
when: not ansible_check_mode|bool
tags:
- facts
{%- for step in range(0,upgrade_steps_max) %}
@ -1351,6 +1356,7 @@ outputs:
- name: Set all_nodes data as group_vars for overcloud
include_vars: "{{ '{{ ' }} playbook_dir {{ ' }}' }}/group_vars/overcloud.json"
no_log: true
when: not ansible_check_mode|bool
tags:
- facts
{%- for step in range(external_upgrade_steps_max) %}
@ -1482,6 +1488,7 @@ outputs:
- name: Set all_nodes data as group_vars for overcloud
include_vars: "{{ '{{ ' }} playbook_dir {{ ' }}' }}/group_vars/overcloud.json"
no_log: true
when: not ansible_check_mode|bool
tags:
- facts
- hosts: DEPLOY_TARGET_HOST