Make Wait Conditions depend on config creation

Currently our wait conditions are racing with Heat resolving
configurations. There should be plenty of time but sometimes Heat may
be dealing with a temporarily problematic Nova API and spinning on that.
While that is happening, the in-instance tools will not have their full
configuration available to them. We don't want the wait condition timeout
to start until the box has had its actual config exposed to it.

Change-Id: I0eab8fe7547d3cbcebb1559fd3d06206b1750e96

diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 55665dc..13cc231 100644 (file)
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -108,7 +108,7 @@ Resources:
         Ref: ComputeUser
   NovaCompute0CompletionCondition:
     Type: AWS::CloudFormation::WaitCondition
-    DependsOn: notCompute0
+    DependsOn: notCompute0Config
     Properties:
       Handle: {Ref: NovaCompute0CompletionHandle}
       Count: '1'

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 6d21a4d..83844f2 100644 (file)
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -144,7 +144,7 @@ Resources:
     Type: AWS::IAM::AccessKey
   notCompute0CompletionCondition:
     Type: AWS::CloudFormation::WaitCondition
-    DependsOn: notCompute0
+    DependsOn: notCompute0Config
     Properties:
       Handle: {Ref: notCompute0CompletionHandle}
       Count: '1'