From: Steven Hardy <shardy@redhat.com>
Date: Tue, 2 May 2017 10:54:12 +0000 (+0100)
Subject: Ensure AllNodesExtraConfig runs before AllNodesDeploySteps
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f907ee34acdcb756b7c82c208f11fcb8678a54a9;p=apex-tripleo-heat-templates.git

Ensure AllNodesExtraConfig runs before AllNodesDeploySteps

When implementing custom roles, we lost an implicit dependency that
ensured AllNodesExtraConfig is applied before AllNodesDeploySteps,
which causes problems if you need to write hieradata via the
AllNodesExtraConfig hook (some cisco integrations we have in tree
do this, and are now broken because the ordering is no longer ensured.

Change-Id: Ie78ecbb4e135ab7f196867ef9d8d271049a9cd10
Closes-Bug: #1687597
(cherry picked from commit 4efc067a7e2965fc7a07eb05b019d0e3e8160606)
---

diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index a36e4078..181fb6c7 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -637,6 +637,7 @@ resources:
   AllNodesDeploySteps:
     type: OS::TripleO::PostDeploySteps
     depends_on:
+      - AllNodesExtraConfig
 {% for role in roles %}
       - {{role.name}}AllNodesDeployment
 {% endfor %}