aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Slagle <jslagle@redhat.com>2016-03-04 16:20:05 -0500
committerJames Slagle <jslagle@redhat.com>2016-03-04 16:20:05 -0500
commit0951c6e359edd2d34cd2bbd6a12278454a905258 (patch)
tree23875683706c2f41beb71526db63cba1a8163c8a
parent205ea09ca27caaeaddab27f3b021b398db195890 (diff)
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
-rw-r--r--overcloud.yaml8
1 files changed, 7 insertions, 1 deletions
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]}