Browse Source

Merge "Fix reserved name variable" into stable/train

changes/84/735184/4
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
9592add608
2 changed files with 7 additions and 7 deletions
  1. +6
    -6
      common/deploy-steps-playbooks-common.yaml
  2. +1
    -1
      common/deploy-steps.j2

+ 6
- 6
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


+ 1
- 1
common/deploy-steps.j2 View File

@@ -1149,7 +1149,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


Loading…
Cancel
Save