Merge "Fix tasks in check mode" into stable/rocky
This commit is contained in:
commit
c989309714
|
@ -368,6 +368,7 @@
|
|||
failed_when: outputs.rc not in [0, 2]
|
||||
tags:
|
||||
- host_config
|
||||
ignore_errors: "{{ ansible_check_mode }}"
|
||||
|
||||
######################################
|
||||
# Generate config via docker-puppet.py
|
||||
|
@ -399,6 +400,7 @@
|
|||
failed_when: outputs.rc != 0
|
||||
tags:
|
||||
- container_config
|
||||
ignore_errors: "{{ ansible_check_mode }}"
|
||||
|
||||
- name: Diff docker-puppet.py puppet-generated changes for check mode
|
||||
shell: |
|
||||
|
|
|
@ -434,6 +434,7 @@ outputs:
|
|||
command: /usr/bin/rpm -q libvirt-daemon
|
||||
failed_when: false
|
||||
register: libvirt_installed
|
||||
check_mode: no
|
||||
- name: make sure libvirt services are disabled
|
||||
service:
|
||||
name: "{{ item }}"
|
||||
|
|
|
@ -474,6 +474,7 @@ outputs:
|
|||
src: /var/log/swift
|
||||
dest: /var/log/containers/swift
|
||||
state: link
|
||||
ignore_errors: "{{ ansible_check_mode }}"
|
||||
- name: swift logs readme
|
||||
copy:
|
||||
dest: /var/log/swift/readme.txt
|
||||
|
|
|
@ -84,11 +84,13 @@ outputs:
|
|||
state: file
|
||||
suffix: -prepare-param
|
||||
register: prepare_param
|
||||
check_mode: no
|
||||
- name: Create temp file for role data
|
||||
tempfile:
|
||||
state: file
|
||||
suffix: -role-data
|
||||
register: role_data
|
||||
check_mode: no
|
||||
- name: Write ContainerImagePrepare parameter file
|
||||
copy:
|
||||
dest: "{{ '{{' }} prepare_param.path {{ '}}' }}"
|
||||
|
@ -111,7 +113,9 @@ outputs:
|
|||
file:
|
||||
dest: "{{ '{{' }} prepare_param.path {{ '}}' }}"
|
||||
state: absent
|
||||
check_mode: no
|
||||
- name: Delete role file
|
||||
file:
|
||||
dest: "{{ '{{' }} role_data.path {{ '}}' }}"
|
||||
state: absent
|
||||
check_mode: no
|
||||
|
|
Loading…
Reference in New Issue