From 0ed634442c0a33b663efe3c01a2d42bb96c008e6 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Thu, 11 Jun 2020 09:51:45 -0400
Subject: [PATCH] Allow more tasks to be run in check mode

When running Ansible in check mode (aka dry run), some tasks need some
changes, specially around variables and make sure they are actually
defined.

Change-Id: I337aa287f1c88a0e2707b441fc6b19b997d52385
(cherry picked from commit 4eb121a36e8ac348489e3af8def24c066a1b0118)
---
 common/deploy-steps-tasks.yaml                        | 3 +++
 deployment/cinder/cinder-common-container-puppet.yaml | 4 ++++
 deployment/haproxy/haproxy-pacemaker-puppet.yaml      | 2 ++
 deployment/haproxy/haproxy-public-tls-inject.yaml     | 2 ++
 deployment/neutron/neutron-dhcp-container-puppet.yaml | 4 +++-
 deployment/neutron/neutron-l3-container-puppet.yaml   | 4 +++-
 deployment/ovn/ovn-metadata-container-puppet.yaml     | 4 +++-
 7 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/common/deploy-steps-tasks.yaml b/common/deploy-steps-tasks.yaml
index ce824facc9..5f4b632e8a 100644
--- a/common/deploy-steps-tasks.yaml
+++ b/common/deploy-steps-tasks.yaml
@@ -43,6 +43,9 @@
   delay: 3
   failed_when:
     - (not puppet_host_outputs.finished) or (puppet_host_outputs.rc is defined and puppet_host_outputs.rc not in [0, 2])
+  when:
+    - not (ansible_check_mode | bool)
+    - enable_puppet|bool
   tags:
     - host_config
 
diff --git a/deployment/cinder/cinder-common-container-puppet.yaml b/deployment/cinder/cinder-common-container-puppet.yaml
index 40bd8c60d1..f8103b58a3 100644
--- a/deployment/cinder/cinder-common-container-puppet.yaml
+++ b/deployment/cinder/cinder-common-container-puppet.yaml
@@ -166,6 +166,8 @@ outputs:
                   vg: "cinder-volumes"
                   pvs: "{{ _loopback_device.stdout }}"
                   state: present
+                when:
+                  - not (ansible_check_mode | bool)
               - name: cinder create service to run losetup for LVM on startup
                 copy:
                   dest: /etc/systemd/system/cinder-lvm-losetup.service
@@ -186,6 +188,8 @@ outputs:
 
                     [Install]
                     WantedBy=local-fs-pre.target
+                when:
+                  - not (ansible_check_mode | bool)
               - name: cinder enable the LVM losetup service
                 systemd:
                   name: cinder-lvm-losetup
diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml
index bf64a15967..407280fc6c 100644
--- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml
+++ b/deployment/haproxy/haproxy-pacemaker-puppet.yaml
@@ -373,6 +373,8 @@ outputs:
           - name: set is_haproxy_bootstrap_node fact
             tags: common
             set_fact: is_haproxy_bootstrap_node={{haproxy_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+            when:
+              - haproxy_short_bootstrap_node_name|default(false)
         - name: Mount TLS cert if needed
           when:
             - step|int == 1
diff --git a/deployment/haproxy/haproxy-public-tls-inject.yaml b/deployment/haproxy/haproxy-public-tls-inject.yaml
index e208e4eedf..d7d1461b83 100644
--- a/deployment/haproxy/haproxy-public-tls-inject.yaml
+++ b/deployment/haproxy/haproxy-public-tls-inject.yaml
@@ -86,6 +86,8 @@ outputs:
 
             - name: set is_haproxy_bootstrap_node fact
               set_fact: is_haproxy_bootstrap_node={{haproxy_short_bootstrap_node_name | lower == ansible_hostname | lower}}
+              when:
+                - haproxy_short_bootstrap_node_name|default(false)
 
             - name: get haproxy status
               register: haproxy_state
diff --git a/deployment/neutron/neutron-dhcp-container-puppet.yaml b/deployment/neutron/neutron-dhcp-container-puppet.yaml
index 3a3db31526..505258ae0f 100644
--- a/deployment/neutron/neutron-dhcp-container-puppet.yaml
+++ b/deployment/neutron/neutron-dhcp-container-puppet.yaml
@@ -428,7 +428,9 @@ outputs:
           - - name: remove temp namespace
               command: ip netns delete ns_temp
               failed_when: false
-              when: ipnetns_add_result.rc == 0
+              when:
+                - ipnetns_add_result.rc is defined
+                - ipnetns_add_result.rc == 0
           - - name: create /var/lib/neutron
               file:
                 path: /var/lib/neutron
diff --git a/deployment/neutron/neutron-l3-container-puppet.yaml b/deployment/neutron/neutron-l3-container-puppet.yaml
index 1db34576b8..c51be8bcd1 100644
--- a/deployment/neutron/neutron-l3-container-puppet.yaml
+++ b/deployment/neutron/neutron-l3-container-puppet.yaml
@@ -383,7 +383,9 @@ outputs:
           - - name: remove temp namespace
               command: ip netns delete ns_temp
               failed_when: false
-              when: ipnetns_add_result.rc == 0
+              when:
+                - ipnetns_add_result.rc is defined
+                - ipnetns_add_result.rc == 0
           - - name: create /var/lib/neutron
               file:
                 path: /var/lib/neutron
diff --git a/deployment/ovn/ovn-metadata-container-puppet.yaml b/deployment/ovn/ovn-metadata-container-puppet.yaml
index 302b616c42..49fad47c44 100644
--- a/deployment/ovn/ovn-metadata-container-puppet.yaml
+++ b/deployment/ovn/ovn-metadata-container-puppet.yaml
@@ -374,7 +374,9 @@ outputs:
           - - name: remove temp namespace
               command: ip netns delete ns_temp
               failed_when: false
-              when: ipnetns_add_result.rc == 0
+              when:
+                - ipnetns_add_result.rc is defined
+                - ipnetns_add_result.rc == 0
           - - name: create /var/lib/neutron
               file:
                 path: /var/lib/neutron