From da727d0c46710f9d6483cdbc8ee51ea997801a84 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Wed, 3 Jun 2020 09:53:16 -0600
Subject: [PATCH] Fix reserved name variable

The scale down actions appear to fail under newer versions of ansible if
the nodes are unavailable. In the logs we see:

[WARNING]: Found variable using reserved name: ignore_unreachable

This change renames our variable to not collide with ignore_unreachable

Change-Id: Ida54f59fc1415122241493c02a0fc764d09ae6c1
(cherry picked from commit 5843a7667c93ded7c7ed3e59d408ddd5ca4876fd)
---
 common/deploy-steps-playbooks-common.yaml | 12 ++++++------
 common/deploy-steps.j2                    |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/deploy-steps-playbooks-common.yaml b/common/deploy-steps-playbooks-common.yaml
index 84c51c7c58..93bbcbb4e9 100644
--- a/common/deploy-steps-playbooks-common.yaml
+++ b/common/deploy-steps-playbooks-common.yaml
@@ -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
diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index c467e2ae68..fec2c455e5 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -1163,7 +1163,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