summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClint Byrum <clint@fewbar.com>2013-11-25 13:31:02 -0800
committerClint Byrum <clint@fewbar.com>2013-11-25 13:31:02 -0800
commit38fcc17219bc2457be42e323295784fd0e04747c (patch)
tree9360d7a9155e0b6c3d8b7380844d49d52c90e9ad
parente6afddb3ca4f100ad29fc7a9c30f43e6e5abdc22 (diff)
Wait for o-r-c on nova compute as well.
We have seen situations where nova-compute is not ready when notcompute has run its waitcondition. That leads to errors while we fail to boot instances until there is at least one nova compute available. We also update nova-compute-instance.yaml so that it continues to work stand-alone. Change-Id: Iadea7a34e2cd4576cc78659b99c12e1041af5b45
-rw-r--r--nova-compute-instance.yaml11
-rw-r--r--overcloud-source.yaml2
2 files changed, 12 insertions, 1 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 91520659..2aadea8d 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -67,6 +67,15 @@ Resources:
Properties:
UserName:
Ref: ComputeUser
+ CompletionCondition:
+ Type: AWS::CloudFormation::WaitCondition
+ DependsOn: notcompute
+ Properties:
+ Handle: {Ref: CompletionHandle}
+ Count: '1'
+ Timeout: '1800'
+ CompletionHandle:
+ Type: AWS::CloudFormation::WaitConditionHandle
NovaCompute0:
Type: OS::Nova::Server
Properties:
@@ -90,6 +99,8 @@ Resources:
InstanceType: '0'
ImageId: '0'
Metadata:
+ completion-handle:
+ Ref: CompletionHandle
os-collect-config:
cfn:
access_key_id:
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 798ca8dc..3e83684d 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -100,7 +100,7 @@ Resources:
DependsOn: notcompute
Properties:
Handle: {Ref: CompletionHandle}
- Count: '1'
+ Count: '2'
Timeout: '1800'
CompletionHandle:
Type: AWS::CloudFormation::WaitConditionHandle