From: Jiri Stransky <jistr@redhat.com>
Date: Wed, 24 May 2017 10:21:47 +0000 (+0200)
Subject: Fix race condition between docker-puppet and container steps
X-Git-Tag: opnfv-6.0.0~632
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a42b93d503690cb56d6a1053759f5b9a9a65fd4e;p=apex-tripleo-heat-templates.git

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
---

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 %}