diff options
| author |   Ryan Brady <rbrady@redhat.com> | 2014-03-13 13:15:21 -0400 |
|---|---|---|
| committer | Ryan Brady <rbrady@redhat.com> | 2014-03-13 15:04:05 -0400 |
| commit | b134483627fa21af4788402b2ca984c17a48afe9 (patch) | |
| tree | 158763ba8842d6a0c667fe3c4f7154923334bd37 | |
| parent | 0490dd665899d3265a72965aeaf3a342275f4328 (diff) | |
Add Wait Condition to Block Storage Templates
In some environments the heat stack-create command would complete
even though the block storage node would still be in a
build/spawning state. This patch adds a wait condition to ensure
the block storage node has a chance to complete and the stack-create
command to complete properly.
Change-Id: Idb524625b8d6df1ff6f927c22b72bc6d3d611686
Partial-Bug: #1290764
| -rw-r--r-- | block-storage-nfs.yaml | 11 | ||||
| -rw-r--r-- | block-storage.yaml | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/block-storage-nfs.yaml b/block-storage-nfs.yaml index 04f45ef4..eabe983a 100644 --- a/block-storage-nfs.yaml +++ b/block-storage-nfs.yaml @@ -23,6 +23,15 @@ Resources: Properties: UserName: Ref: BlockStorageUser + BlockStorage0CompletionCondition: + Type: AWS::CloudFormation::WaitCondition + DependsOn: notCompute0Config + Properties: + Handle: {Ref: BlockStorage0CompletionHandle} + Count: '1' + Timeout: '1800' + BlockStorage0CompletionHandle: + Type: AWS::CloudFormation::WaitConditionHandle BlockStorage0: Type: OS::Nova::Server Properties: @@ -31,6 +40,8 @@ Resources: flavor: {Ref: OvercloudBlockStorageFlavor} key_name: {Ref: KeyName} Metadata: + completion-handle: + Ref: BlockStorage0CompletionHandle os-collect-config: cfn: access_key_id: diff --git a/block-storage.yaml b/block-storage.yaml index 8508e1f1..507ca631 100644 --- a/block-storage.yaml +++ b/block-storage.yaml @@ -23,6 +23,15 @@ Resources: Properties: UserName: Ref: BlockStorageUser + BlockStorage0CompletionCondition: + Type: AWS::CloudFormation::WaitCondition + DependsOn: notCompute0Config + Properties: + Handle: {Ref: BlockStorage0CompletionHandle} + Count: '1' + Timeout: '1800' + BlockStorage0CompletionHandle: + Type: AWS::CloudFormation::WaitConditionHandle BlockStorage0: Type: OS::Nova::Server Properties: @@ -31,6 +40,8 @@ Resources: flavor: {Ref: OvercloudBlockStorageFlavor} key_name: {Ref: KeyName} Metadata: + completion-handle: + Ref: BlockStorage0CompletionHandle os-collect-config: cfn: access_key_id: |