aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2017-05-02 11:54:12 +0100
committerEmilien Macchi <emilien@redhat.com>2017-05-02 15:05:13 +0000
commitb8f97f5e1b36dd12c0750b83c54f17e931990a40 (patch)
tree796c9362da006058a44c26dbd2316171b24fcfb5
parent903778a8684bc8d314078e3afa73cf74d38f2910 (diff)
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
-rw-r--r--overcloud.j2.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 54092fa2..7cf6ad5c 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 %}