From dcfbcb6442cf8bcaf08091a32f6e3d753e4439f9 Mon Sep 17 00:00:00 2001 From: Clint Byrum Date: Wed, 26 Feb 2014 14:27:24 -0800 Subject: [PATCH] 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 --- nova-compute-instance.yaml | 2 +- overcloud-source.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index 55665dce8a..13cc23108e 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 6d21a4dc0b..83844f2bb2 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'