Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add ServerIdMap output"
[apex-tripleo-heat-templates.git]
/
docker
/
deploy-steps-playbook.yaml
diff --git
a/docker/deploy-steps-playbook.yaml
b/docker/deploy-steps-playbook.yaml
index
a0beaa2
..
87587a4
100644
(file)
--- a/
docker/deploy-steps-playbook.yaml
+++ b/
docker/deploy-steps-playbook.yaml
@@
-17,18
+17,22
@@
shell: python /var/lib/docker-puppet/docker-puppet.py
environment:
NET_HOST: 'true'
shell: python /var/lib/docker-puppet/docker-puppet.py
environment:
NET_HOST: 'true'
+ DEBUG: '{{docker_puppet_debug}}'
when: step == "1"
changed_when: false
check_mode: no
##################################################
# Per step starting of the containers using paunch
##################################################
when: step == "1"
changed_when: false
check_mode: no
##################################################
# Per step starting of the containers using paunch
##################################################
- - name: Check if /var/lib/tripleo-config/docker-container-startup-config-step_{{step}}.json exists
+ - name: Check if /var/lib/
hashed-
tripleo-config/docker-container-startup-config-step_{{step}}.json exists
stat:
stat:
- path: /var/lib/tripleo-config/docker-container-startup-config-step_{{step}}.json
+ path: /var/lib/tripleo-config/
hashed-
docker-container-startup-config-step_{{step}}.json
register: docker_config_json
register: docker_config_json
+ # Note docker-puppet.py generates the hashed-*.json file, which is a copy of
+ # the *step_n.json with a hash of the generated external config added
+ # This acts as a salt to enable restarting the container if config changes
- name: Start containers for step {{step}}
- name: Start containers for step {{step}}
- command: paunch --debug apply --file /var/lib/tripleo-config/docker-container-startup-config-step_{{step}}.json --config-id tripleo_step{{step}} --managed-by tripleo-{{role_name}}
+ command: paunch --debug apply --file /var/lib/tripleo-config/
hashed-
docker-container-startup-config-step_{{step}}.json --config-id tripleo_step{{step}} --managed-by tripleo-{{role_name}}
when: docker_config_json.stat.exists
changed_when: false
check_mode: no
when: docker_config_json.stat.exists
changed_when: false
check_mode: no