summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-03-05 09:29:37 +0000
committerGerrit Code Review <review@openstack.org>2014-03-05 09:29:37 +0000
commita5516561a6dda085e641c807caa83abae3556bf2 (patch)
tree8f7217ede576b32bc65c79312040e0e16e68b46e
parent9f4420800947b9f9860962edf9217934dc8012f3 (diff)
parentdcfbcb6442cf8bcaf08091a32f6e3d753e4439f9 (diff)
Merge "Make Wait Conditions depend on config creation"
-rw-r--r--nova-compute-instance.yaml2
-rw-r--r--overcloud-source.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 2aca285b..d2ca90f5 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 712c7300..d9e307b8 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -148,7 +148,7 @@ Resources:
Type: AWS::IAM::AccessKey
notCompute0CompletionCondition:
Type: AWS::CloudFormation::WaitCondition
- DependsOn: notCompute0
+ DependsOn: notCompute0Config
Properties:
Handle: {Ref: notCompute0CompletionHandle}
Count: '1'