openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix tasks in check mode" into stable/rocky

This commit is contained in:
Zuul 2018-12-08 11:56:41 +00:00 committed by Gerrit Code Review
parent 4bd61a3275 338e2202bd
commit c989309714
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/deploy-steps-tasks.yaml
View File

@ -368,6 +368,7 @@
failed_when: outputs.rc not in [0, 2] failed_when: outputs.rc not in [0, 2]
tags: tags:
- host_config - host_config
ignore_errors: "{{ ansible_check_mode }}"
###################################### ######################################
# Generate config via docker-puppet.py # Generate config via docker-puppet.py
@ -399,6 +400,7 @@
failed_when: outputs.rc != 0 failed_when: outputs.rc != 0
tags: tags:
- container_config - container_config
ignore_errors: "{{ ansible_check_mode }}"
- name: Diff docker-puppet.py puppet-generated changes for check mode - name: Diff docker-puppet.py puppet-generated changes for check mode
shell: | shell: |

1
docker/services/nova-libvirt.yaml
View File

@ -434,6 +434,7 @@ outputs:
command: /usr/bin/rpm -q libvirt-daemon command: /usr/bin/rpm -q libvirt-daemon
failed_when: false failed_when: false
register: libvirt_installed register: libvirt_installed
check_mode: no
- name: make sure libvirt services are disabled - name: make sure libvirt services are disabled
service: service:
name: "{{ item }}" name: "{{ item }}"

1
docker/services/swift-storage.yaml
View File

@ -474,6 +474,7 @@ outputs:
src: /var/log/swift src: /var/log/swift
dest: /var/log/containers/swift dest: /var/log/containers/swift
state: link state: link
ignore_errors: "{{ ansible_check_mode }}"
- name: swift logs readme - name: swift logs readme
copy: copy:
dest: /var/log/swift/readme.txt dest: /var/log/swift/readme.txt

4
puppet/services/container-image-prepare.j2.yaml
View File

@ -84,11 +84,13 @@ outputs:
state: file state: file
suffix: -prepare-param suffix: -prepare-param
register: prepare_param register: prepare_param
check_mode: no
- name: Create temp file for role data - name: Create temp file for role data
tempfile: tempfile:
state: file state: file
suffix: -role-data suffix: -role-data
register: role_data register: role_data
check_mode: no
- name: Write ContainerImagePrepare parameter file - name: Write ContainerImagePrepare parameter file
copy: copy:
dest: "{{ '{{' }} prepare_param.path {{ '}}' }}" dest: "{{ '{{' }} prepare_param.path {{ '}}' }}"
@ -111,7 +113,9 @@ outputs:
file: file:
dest: "{{ '{{' }} prepare_param.path {{ '}}' }}" dest: "{{ '{{' }} prepare_param.path {{ '}}' }}"
state: absent state: absent
check_mode: no
- name: Delete role file - name: Delete role file
file: file:
dest: "{{ '{{' }} role_data.path {{ '}}' }}" dest: "{{ '{{' }} role_data.path {{ '}}' }}"
state: absent state: absent
check_mode: no