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
This commit is contained in:
parent
0490dd6658
commit
b134483627
|
@ -23,6 +23,15 @@ Resources:
|
||||||
Properties:
|
Properties:
|
||||||
UserName:
|
UserName:
|
||||||
Ref: BlockStorageUser
|
Ref: BlockStorageUser
|
||||||
|
BlockStorage0CompletionCondition:
|
||||||
|
Type: AWS::CloudFormation::WaitCondition
|
||||||
|
DependsOn: notCompute0Config
|
||||||
|
Properties:
|
||||||
|
Handle: {Ref: BlockStorage0CompletionHandle}
|
||||||
|
Count: '1'
|
||||||
|
Timeout: '1800'
|
||||||
|
BlockStorage0CompletionHandle:
|
||||||
|
Type: AWS::CloudFormation::WaitConditionHandle
|
||||||
BlockStorage0:
|
BlockStorage0:
|
||||||
Type: OS::Nova::Server
|
Type: OS::Nova::Server
|
||||||
Properties:
|
Properties:
|
||||||
|
@ -31,6 +40,8 @@ Resources:
|
||||||
flavor: {Ref: OvercloudBlockStorageFlavor}
|
flavor: {Ref: OvercloudBlockStorageFlavor}
|
||||||
key_name: {Ref: KeyName}
|
key_name: {Ref: KeyName}
|
||||||
Metadata:
|
Metadata:
|
||||||
|
completion-handle:
|
||||||
|
Ref: BlockStorage0CompletionHandle
|
||||||
os-collect-config:
|
os-collect-config:
|
||||||
cfn:
|
cfn:
|
||||||
access_key_id:
|
access_key_id:
|
||||||
|
|
|
@ -23,6 +23,15 @@ Resources:
|
||||||
Properties:
|
Properties:
|
||||||
UserName:
|
UserName:
|
||||||
Ref: BlockStorageUser
|
Ref: BlockStorageUser
|
||||||
|
BlockStorage0CompletionCondition:
|
||||||
|
Type: AWS::CloudFormation::WaitCondition
|
||||||
|
DependsOn: notCompute0Config
|
||||||
|
Properties:
|
||||||
|
Handle: {Ref: BlockStorage0CompletionHandle}
|
||||||
|
Count: '1'
|
||||||
|
Timeout: '1800'
|
||||||
|
BlockStorage0CompletionHandle:
|
||||||
|
Type: AWS::CloudFormation::WaitConditionHandle
|
||||||
BlockStorage0:
|
BlockStorage0:
|
||||||
Type: OS::Nova::Server
|
Type: OS::Nova::Server
|
||||||
Properties:
|
Properties:
|
||||||
|
@ -31,6 +40,8 @@ Resources:
|
||||||
flavor: {Ref: OvercloudBlockStorageFlavor}
|
flavor: {Ref: OvercloudBlockStorageFlavor}
|
||||||
key_name: {Ref: KeyName}
|
key_name: {Ref: KeyName}
|
||||||
Metadata:
|
Metadata:
|
||||||
|
completion-handle:
|
||||||
|
Ref: BlockStorage0CompletionHandle
|
||||||
os-collect-config:
|
os-collect-config:
|
||||||
cfn:
|
cfn:
|
||||||
access_key_id:
|
access_key_id:
|
||||||
|
|
Loading…
Reference in New Issue