aboutsummaryrefslogtreecommitdiffstats
path: root/docker/deploy-steps-playbook.yaml
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2017-07-19 20:36:11 +0100
committermarios <marios@redhat.com>2017-07-24 14:02:44 +0300
commit0a44085af6ba31e81f8eac25a13b375a245b03da (patch)
tree5c6cbdfb2627364203fd5d8e61610cf90fd80801 /docker/deploy-steps-playbook.yaml
parentd364d9cca2fd8c703fab93ec97c1330bbe2401aa (diff)
Move docker_puppet_tasks calculation into services.yaml
This makes the RolesData output more accurate, and we can rework things so docker-puppet only gets run when there is a non-empty file calculated (e.g there are tasks to run). Change-Id: I8cdab3c857977c80fe2e359ab9e05740a838d66b
Diffstat (limited to 'docker/deploy-steps-playbook.yaml')
-rw-r--r--docker/deploy-steps-playbook.yaml6
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/deploy-steps-playbook.yaml b/docker/deploy-steps-playbook.yaml
index 446c73a6..cd7d5b55 100644
--- a/docker/deploy-steps-playbook.yaml
+++ b/docker/deploy-steps-playbook.yaml
@@ -64,6 +64,10 @@
########################################################
# Bootstrap tasks, only performed on bootstrap_server_id
########################################################
+ - name: Check if /var/lib/docker-puppet/docker-puppet-tasks{{step}}.json exists
+ stat:
+ path: /var/lib/docker-puppet/docker-puppet-tasks{{step}}.json
+ register: docker_puppet_tasks_json
- name: Run docker-puppet tasks (bootstrap tasks)
shell: python /var/lib/docker-puppet/docker-puppet.py
environment:
@@ -71,7 +75,7 @@
NET_HOST: "true"
NO_ARCHIVE: "true"
STEP: "{{step}}"
- when: deploy_server_id == bootstrap_server_id
+ when: deploy_server_id == bootstrap_server_id and docker_puppet_tasks_json.stat.exists
changed_when: false
check_mode: no
register: outputs