openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "check mode: docker_puppet_tasks"

Browse Source
This commit is contained in:
Zuul 2018-10-20 08:01:44 +00:00 committed by Gerrit Code Review
commit 557e69c0dc
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,6 +97,7 @@
selevel: s0 selevel: s0
tags: tags:
- container_config - container_config
- container_config_tasks
- name: Delete existing /var/lib/docker-puppet/check-mode for check mode - name: Delete existing /var/lib/docker-puppet/check-mode for check mode
file: file:
@ -277,7 +278,7 @@
- name: Write docker-puppet-tasks json files - name: Write docker-puppet-tasks json files
copy: copy:
content: "{{item[1]|to_json}}" content: "{{item[1]|to_nice_json}}"
dest: /var/lib/docker-puppet/docker-puppet-tasks{{item[0].replace("step_", "")}}.json dest: /var/lib/docker-puppet/docker-puppet-tasks{{item[0].replace("step_", "")}}.json
force: yes force: yes
mode: '0600' mode: '0600'
@ -410,8 +411,9 @@
- container_config - container_config
- name: Diff docker-puppet.py puppet-generated changes for check mode - name: Diff docker-puppet.py puppet-generated changes for check mode
command: shell: |
diff -ruN /var/lib/config-data/puppet-generated /var/lib/config-data/check-mode/puppet-generated diff -ruN --no-dereference -q /var/lib/config-data/puppet-generated /var/lib/config-data/check-mode/puppet-generated
diff -ruN --no-dereference /var/lib/config-data/puppet-generated /var/lib/config-data/check-mode/puppet-generated
register: diff_results register: diff_results
tags: tags:
- container_config - container_config
@ -469,7 +471,7 @@
- name: Check if /var/lib/docker-puppet/docker-puppet-tasks{{ step }}.json exists - name: Check if /var/lib/docker-puppet/docker-puppet-tasks{{ step }}.json exists
stat: stat:
path: /var/lib/docker-puppet/docker-puppet-tasks{{ step }}.json path: /var/lib/docker-puppet/{{ ansible_check_mode | ternary('check-mode/', '') }}docker-puppet-tasks{{ step }}.json
register: docker_puppet_tasks_json register: docker_puppet_tasks_json
tags: tags:
- container_config_tasks - container_config_tasks
@ -477,7 +479,8 @@
- name: Run docker-puppet tasks (bootstrap tasks) for step {{ step }} - name: Run docker-puppet tasks (bootstrap tasks) for step {{ step }}
shell: python /var/lib/docker-puppet/docker-puppet.py shell: python /var/lib/docker-puppet/docker-puppet.py
environment: environment:
CONFIG: /var/lib/docker-puppet/docker-puppet-tasks{{ step }}.json CONFIG: /var/lib/docker-puppet/{{ ansible_check_mode | ternary('check-mode/', '') }}docker-puppet-tasks{{ step }}.json
CONFIG_VOLUME_PREFIX: '/var/lib/config-data{{ ansible_check_mode | ternary("/check-mode", "") }}'
NET_HOST: "true" NET_HOST: "true"
NO_ARCHIVE: "true" NO_ARCHIVE: "true"
STEP: "{{ step }}" STEP: "{{ step }}"
@ -486,7 +489,6 @@
- deploy_server_id == bootstrap_server_id - deploy_server_id == bootstrap_server_id
- docker_puppet_tasks_json.stat.exists - docker_puppet_tasks_json.stat.exists
changed_when: false changed_when: false
check_mode: no
register: outputs register: outputs
failed_when: false failed_when: false
no_log: true no_log: true