Add glance heat and keystone to notcompute

[apex-tripleo-heat-templates.git] / notcompute.yaml

diff --git a/notcompute.yaml b/notcompute.yaml
index bfe6d7a..a97f4d7 100644 (file)
--- a/notcompute.yaml
+++ b/notcompute.yaml
@@ -1,5 +1,5 @@
-Description: Dedicated MySQL server,Dedicated MySQL
-  server,Nova API
+Description: Dedicated RabbitMQ Server,Dedicated MySQL server,Nova API,Keystone,Heat
+  Engine and API,Glance
 HeatTemplateFormatVersion: '2012-12-12'
 Outputs:
   GlancePassword:
@@ -33,6 +33,8 @@ Outputs:
     - RabbitMQPassword
     - Data
 Parameters:
+  AdminToken:
+    Type: String
   BootstrapDumpPassword:
     Default: ''
     Description: Password to use for mysqldump from Bootstrap Host
@@ -53,6 +55,9 @@ Parameters:
     Default: ''
     Description: User to use for replication from bootstrap host
     Type: String
+  GlanceDSN:
+    Description: DSN for connecting to glance database
+    Type: String
   GlanceUser:
     Default: heat
     Description: Glance database username.
@@ -69,6 +74,9 @@ Parameters:
     Default: default
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
     Type: String
+  KeystoneDSN:
+    Description: DSN for connecting to keystone
+    Type: String
   KeystoneHost:
     Type: String
   KeystoneUser:
@@ -86,6 +94,12 @@ Parameters:
     Type: String
   RabbitHost:
     Type: String
+  RabbitMQHost:
+    Description: Host for RabbitMQ
+    Type: String
+  RabbitMQPassword:
+    Description: Password for RabbitMQ
+    Type: String
   RabbitPassword:
     Type: String
   ServicePassword:
@@ -126,6 +140,16 @@ Resources:
     Type: AWS::CloudFormation::WaitCondition
   GlancePasswordHandle:
     Type: AWS::CloudFormation::WaitConditionHandle
+  HeatAccessPolicy:
+    Properties:
+      AllowedResources:
+      - notcompute
+    Type: OS::Heat::AccessPolicy
+  HeatKey:
+    Properties:
+      UserName:
+        Ref: HeatUser
+    Type: AWS::IAM::AccessKey
   HeatPassword:
     DependsOn: notcompute
     Properties:
@@ -135,6 +159,11 @@ Resources:
     Type: AWS::CloudFormation::WaitCondition
   HeatPasswordHandle:
     Type: AWS::CloudFormation::WaitConditionHandle
+  HeatUser:
+    Properties:
+      Policies:
+      - Ref: HeatAccessPolicy
+    Type: AWS::IAM::User
   Key:
     Properties:
       UserName:
@@ -169,9 +198,18 @@ Resources:
       - rabbitmq-server
       - mysql-migration
       - nova-api
+      - keystone
+      - heat-api
+      - heat-engine
+      - glance
       OpenStack::Role: stateful
       admin-password:
         Ref: ServicePassword
+      admin-token:
+        Ref: AdminToken
+      glance:
+        db:
+          Ref: GlanceDSN
       heat:
         access_key_id:
           Ref: ApiKey