aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Stransky <jistr@redhat.com>2017-05-24 12:21:47 +0200
committerJiri Stransky <jistr@redhat.com>2017-05-24 12:21:47 +0200
commita42b93d503690cb56d6a1053759f5b9a9a65fd4e (patch)
tree4b1f5a1fcf6b91ac447ba666c81225469023f3c5
parente7b44a1364b9bb7045405507f3ecdd2241f89ae3 (diff)
Fix race condition between docker-puppet and container steps
GenerateConfigDeployment wasn't anchored with dependencies anywhere. If it took too long to complete and step 1 of containers creation already started executing, problems happened. This is now fixed by adding the required dependency relationship. Change-Id: Ie7dfd2a965e704ba278d4c2fad67f14a3a62799e Closes-Bug: #1692503
-rw-r--r--docker/docker-steps.j21
1 files changed, 1 insertions, 0 deletions
diff --git a/docker/docker-steps.j2 b/docker/docker-steps.j2
index e24afcf9..030942ef 100644
--- a/docker/docker-steps.j2
+++ b/docker/docker-steps.j2
@@ -277,6 +277,7 @@ resources:
{%- endfor %}
- {{role.name}}PreConfig
- {{role.name}}HostPrepDeployment
+ - {{role.name}}GenerateConfigDeployment
{% else %}
depends_on:
{% for dep in roles %}