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 4eb121a36e)
This commit is contained in:
Emilien Macchi 2020-06-11 09:51:45 -04:00
parent fe759c675e
commit 0ed634442c
7 changed files with 20 additions and 3 deletions

View File

@ -43,6 +43,9 @@
delay: 3 delay: 3
failed_when: failed_when:
- (not puppet_host_outputs.finished) or (puppet_host_outputs.rc is defined and puppet_host_outputs.rc not in [0, 2]) - (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: tags:
- host_config - host_config

View File

@ -166,6 +166,8 @@ outputs:
vg: "cinder-volumes" vg: "cinder-volumes"
pvs: "{{ _loopback_device.stdout }}" pvs: "{{ _loopback_device.stdout }}"
state: present state: present
when:
- not (ansible_check_mode | bool)
- name: cinder create service to run losetup for LVM on startup - name: cinder create service to run losetup for LVM on startup
copy: copy:
dest: /etc/systemd/system/cinder-lvm-losetup.service dest: /etc/systemd/system/cinder-lvm-losetup.service
@ -186,6 +188,8 @@ outputs:
[Install] [Install]
WantedBy=local-fs-pre.target WantedBy=local-fs-pre.target
when:
- not (ansible_check_mode | bool)
- name: cinder enable the LVM losetup service - name: cinder enable the LVM losetup service
systemd: systemd:
name: cinder-lvm-losetup name: cinder-lvm-losetup

View File

@ -373,6 +373,8 @@ outputs:
- name: set is_haproxy_bootstrap_node fact - name: set is_haproxy_bootstrap_node fact
tags: common tags: common
set_fact: is_haproxy_bootstrap_node={{haproxy_short_bootstrap_node_name|lower == ansible_hostname|lower}} 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 - name: Mount TLS cert if needed
when: when:
- step|int == 1 - step|int == 1

View File

@ -86,6 +86,8 @@ outputs:
- name: set is_haproxy_bootstrap_node fact - name: set is_haproxy_bootstrap_node fact
set_fact: is_haproxy_bootstrap_node={{haproxy_short_bootstrap_node_name | lower == ansible_hostname | lower}} 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 - name: get haproxy status
register: haproxy_state register: haproxy_state

View File

@ -428,7 +428,9 @@ outputs:
- - name: remove temp namespace - - name: remove temp namespace
command: ip netns delete ns_temp command: ip netns delete ns_temp
failed_when: false 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 - - name: create /var/lib/neutron
file: file:
path: /var/lib/neutron path: /var/lib/neutron

View File

@ -383,7 +383,9 @@ outputs:
- - name: remove temp namespace - - name: remove temp namespace
command: ip netns delete ns_temp command: ip netns delete ns_temp
failed_when: false 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 - - name: create /var/lib/neutron
file: file:
path: /var/lib/neutron path: /var/lib/neutron

View File

@ -374,7 +374,9 @@ outputs:
- - name: remove temp namespace - - name: remove temp namespace
command: ip netns delete ns_temp command: ip netns delete ns_temp
failed_when: false 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 - - name: create /var/lib/neutron
file: file:
path: /var/lib/neutron path: /var/lib/neutron