openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix reserved name variable" into stable/ussuri

This commit is contained in:
Zuul 2020-06-10 17:37:36 +00:00 committed by Gerrit Code Review
parent 65a3a9f210 da727d0c46
commit d136f83e94
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/deploy-steps-playbooks-common.yaml
View File

@ -1,8 +1,8 @@
- hosts: "{{ deploy_source_host }}"
name: Gather facts from undercloud
gather_facts: yes
any_errors_fatal: "{{ not ignore_unreachable | default(true) }}"
ignore_unreachable: "{{ ignore_unreachable | default(false) }}"
any_errors_fatal: "{{ not scale_ignore_unreachable | default(true) }}"
ignore_unreachable: "{{ scale_ignore_unreachable | default(false) }}"
become: false
tags:
- facts
@ -10,16 +10,16 @@
- hosts: "{{ deploy_target_host }}"
name: Gather facts from overcloud
gather_facts: yes
any_errors_fatal: "{{ not ignore_unreachable | default(true) }}"
ignore_unreachable: "{{ ignore_unreachable | default(false) }}"
any_errors_fatal: "{{ not scale_ignore_unreachable | default(true) }}"
ignore_unreachable: "{{ scale_ignore_unreachable | default(false) }}"
tags:
- facts
- hosts: all
name: Load global variables
gather_facts: "{{ gather_facts | default(false) }}"
any_errors_fatal: "{{ not ignore_unreachable | default(true) }}"
ignore_unreachable: "{{ ignore_unreachable | default(false) }}"
any_errors_fatal: "{{ not scale_ignore_unreachable | default(true) }}"
ignore_unreachable: "{{ scale_ignore_unreachable | default(false) }}"
tasks:
- include_vars: global_vars.yaml
no_log: true

2
common/deploy-steps.j2
View File

@ -1157,7 +1157,7 @@ outputs:
vars:
deploy_source_host: "DEPLOY_SOURCE_HOST"
deploy_target_host: "DEPLOY_TARGET_HOST"
ignore_unreachable: true
scale_ignore_unreachable: true
- hosts: DEPLOY_TARGET_HOST
name: Scaling