Merge "Allow more tasks to be run in check mode"

This commit is contained in:
Zuul 2020-07-08 12:58:49 +00:00 committed by Gerrit Code Review
commit 9065b86cb2
7 changed files with 20 additions and 3 deletions

View File

@ -45,6 +45,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

View File

@ -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

View File

@ -381,6 +381,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

View File

@ -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

View File

@ -399,7 +399,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 is defined
- ipnetns_add_result.rc == 0
- name: create /var/lib/neutron
file:
path: /var/lib/neutron

View File

@ -340,7 +340,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 is defined
- ipnetns_add_result.rc == 0
- name: create /var/lib/neutron
file:
path: /var/lib/neutron

View File

@ -352,7 +352,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 is defined
- ipnetns_add_result.rc == 0
- name: create /var/lib/neutron
file:
path: /var/lib/neutron