From: Clint Byrum <clint@fewbar.com>
Date: Tue, 14 May 2013 18:31:06 +0000 (-0700)
Subject: Simplify keystone into one instance.
X-Git-Tag: opnfv-6.0.0~3022
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=6504e6bd09b8b3b14ce56490ea3e17daf8cc0a93;p=apex-tripleo-heat-templates.git

Simplify keystone into one instance.
---

diff --git a/keystone.yaml b/keystone.yaml
index e4b96d71..fc256203 100644
--- a/keystone.yaml
+++ b/keystone.yaml
@@ -30,8 +30,8 @@ Resources:
     Properties:
       UserName:
         Ref: ApiUser
-  KeystoneLaunch:
-    Type: AWS::AutoScaling::LaunchConfiguration
+  Keystone:
+    Type: AWS::EC2::Instance
     Properties:
       ImageId:
         {Ref: KeystoneImage}
@@ -53,9 +53,3 @@ Resources:
       admin-token: {Ref: AdminToken}
       keystone:
         db: {Ref: KeystoneDSN}
-  Keystone:
-    Type: OS::Heat::InstanceGroup
-    Properties:
-      LaunchConfigurationName: { Ref: KeystoneLaunch }
-      AvailabilityZones: [ 1 ]
-      Size: '1'