diff options
| author |   Robert Collins <rbtcollins@hp.com> | 2014-01-28 19:39:43 +1300 |
|---|---|---|
| committer | Robert Collins <rbtcollins@hp.com> | 2014-01-31 11:23:03 +1300 |
| commit | 9ffb18af9421070fffb9375f1fc5e4c94ede0fde (patch) | |
| tree | 2f257cfdd0748932b1942fc3d3da348d4026d02f /overcloud-source.yaml | |
| parent | 8f842e60bf1f7c85b4ff403263076e3284b22b8a (diff) | |
Update overcloud to support N compute hosts.
This uses the new merge feature earlier in this series.
Exporting COMPUTESCALE before running make will build a different
template. Note that since Make doesn't depend on variable values, you
need to delete overcloud.yaml between building with different scales.
Change-Id: If05b99ae3596bcc794e3a899ab1443aeb14ec754
Diffstat (limited to 'overcloud-source.yaml')
| -rw-r--r-- | overcloud-source.yaml | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 358de7d6..6192cc1a 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -126,15 +126,22 @@ Resources: DependsOn: notcompute Properties: Handle: {Ref: CompletionHandle} - Count: '2' + Count: '1' Timeout: '1800' CompletionHandle: Type: OS::Heat::UpdateWaitConditionHandle - ComputeKey: - Properties: - UserName: - Ref: ComputeUser - Type: AWS::IAM::AccessKey + NovaCompute0Key: + Type: FileInclude + Path: nova-compute-instance.yaml + SubKey: Resources.NovaCompute0Key + NovaCompute0CompletionCondition: + Type: FileInclude + Path: nova-compute-instance.yaml + SubKey: Resources.NovaCompute0CompletionCondition + NovaCompute0CompletionHandle: + Type: FileInclude + Path: nova-compute-instance.yaml + SubKey: Resources.NovaCompute0CompletionHandle ComputeUser: Properties: Policies: |