From: James Slagle <jslagle@redhat.com>
Date: Fri, 4 Mar 2016 21:20:05 +0000 (-0500)
Subject: Make AllNodesExtraConfig depend on the validation deployments
X-Git-Tag: opnfv-6.0.0~2123^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0951c6e359edd2d34cd2bbd6a12278454a905258;p=apex-tripleo-heat-templates.git

Make AllNodesExtraConfig depend on the validation deployments

AllNodesExtraConfig should really only run after the validation
deployments are done, which validate that basic networking is
functioning.

In particular, creating a swap file during AllNodesExtraConfig while the
validation deployments are still running might cause temporary network
outages which could fail the validations.

Change-Id: Ia2a10318de47854a9b8932d72243ce0a85603556
Partial-Bug: #1553243
---

diff --git a/overcloud.yaml b/overcloud.yaml
index d6048de7..0bb2dbdd 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -1549,7 +1549,13 @@ resources:
   # the nested template may configure each role differently (or not at all)
   AllNodesExtraConfig:
     type: OS::TripleO::AllNodesExtraConfig
-    depends_on: UpdateWorkflow
+    depends_on:
+      - UpdateWorkflow
+      - ComputeAllNodesValidationDeployment
+      - BlockStorageAllNodesValidationDeployment
+      - ObjectStorageAllNodesValidationDeployment
+      - CephStorageAllNodesValidationDeployment
+      - ControllerAllNodesValidationDeployment
     properties:
       controller_servers: {get_attr: [Controller, attributes, nova_server_resource]}
       compute_servers: {get_attr: [Compute, attributes, nova_server_resource]}