Fix tasks in check mode
These tasks should have check_mode:no set so that they run in check mode, as the variables they register are used in later tasks. Otherwise, ansible in check mode fails with undefined variable errors. Also, some tasks may fail due to not all requirements being available since those requirements were not created by previous tasks that were also ran in check mode. This adds ignore_errors to these tasks, and sets the value to the boolean ansible_check_mode which is provided by ansible and set based on whether or not --check was passed to the ansible command line. Change-Id: I84bc3c14ede37959a4078fd14ce4661b7bd23f84
This commit is contained in:
parent
d5728ef0b1
commit
16dff38eb4
common
docker/services
puppet/services
@ -378,6 +378,7 @@
|
||||
failed_when: outputs.rc not in [0, 2]
|
||||
tags:
|
||||
- host_config
|
||||
ignore_errors: "{{ ansible_check_mode }}"
|
||||
|
||||
######################################
|
||||
# Generate config via docker-puppet.py
|
||||
@ -410,6 +411,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: |
|
||||
|
@ -461,6 +461,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
|
||||
|
@ -89,11 +89,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 {{ '}}' }}"
|
||||
@ -117,7 +119,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…
x
Reference in New Issue
Block a user