diff options
| author |   Clint Byrum <clint@fewbar.com> | 2014-02-26 14:27:24 -0800 |
|---|---|---|
| committer | Clint Byrum <clint@fewbar.com> | 2014-02-26 14:27:24 -0800 |
| commit | dcfbcb6442cf8bcaf08091a32f6e3d753e4439f9 (patch) | |
| tree | 5b3f595098945ca8fed6b888020e62341201a78d | |
| parent | edf87127836805197d2d67c6c2addcdab60c1b7a (diff) | |
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
| -rw-r--r-- | nova-compute-instance.yaml | 2 | ||||
| -rw-r--r-- | overcloud-source.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index 55665dce..13cc2310 100644 --- 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 6d21a4dc..83844f2b 100644 --- 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' |