From 9ffb18af9421070fffb9375f1fc5e4c94ede0fde Mon Sep 17 00:00:00 2001
From: Robert Collins <rbtcollins@hp.com>
Date: Tue, 28 Jan 2014 19:39:43 +1300
Subject: 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
---
 nova-compute-instance.yaml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'nova-compute-instance.yaml')

diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 229615ad..3abd3216 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -83,19 +83,19 @@ Resources:
     Type: AWS::IAM::User
     Properties:
       Policies: [ { Ref: ComputeAccessPolicy } ]
-  ComputeKey:
+  NovaCompute0Key:
     Type: AWS::IAM::AccessKey
     Properties:
       UserName:
         Ref: ComputeUser
-  CompletionCondition:
+  NovaCompute0CompletionCondition:
     Type: AWS::CloudFormation::WaitCondition
     DependsOn: notcompute
     Properties:
-      Handle: {Ref: CompletionHandle}
+      Handle: {Ref: NovaCompute0CompletionHandle}
       Count: '1'
       Timeout: '1800'
-  CompletionHandle:
+  NovaCompute0CompletionHandle:
     Type: AWS::CloudFormation::WaitConditionHandle
   NovaCompute0:
     Type: OS::Nova::Server
@@ -110,9 +110,9 @@ Resources:
       os-collect-config:
         cfn:
           access_key_id:
-            Ref: ComputeKey
+            Ref: NovaCompute0Key
           secret_access_key:
-            Fn::GetAtt: [ ComputeKey, SecretAccessKey ]
+            Fn::GetAtt: [ NovaCompute0Key, SecretAccessKey ]
           stack_name: {Ref: 'AWS::StackName'}
           path: NovaCompute0Config.Metadata
       OpenStack::ImageBuilder::Elements: [ nova-compute ]
@@ -123,13 +123,13 @@ Resources:
       ImageId: '0'
     Metadata:
       completion-handle:
-        Ref: CompletionHandle
+        Ref: NovaCompute0CompletionHandle
       os-collect-config:
         cfn:
           access_key_id:
-            Ref: ComputeKey
+            Ref: NovaCompute0Key
           secret_access_key:
-            Fn::GetAtt: [ ComputeKey, SecretAccessKey ]
+            Fn::GetAtt: [ NovaCompute0Key, SecretAccessKey ]
           stack_name: {Ref: 'AWS::StackName'}
           path: NovaCompute0Config.Metadata
       nova:
-- 
cgit 1.2.3-korg