From b8f97f5e1b36dd12c0750b83c54f17e931990a40 Mon Sep 17 00:00:00 2001
From: Steven Hardy <shardy@redhat.com>
Date: Tue, 2 May 2017 11:54:12 +0100
Subject: [PATCH] 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
---
 overcloud.j2.yaml | 1 +
 1 file changed, 1 insertion(+)

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