Add FileInclude special type.

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

diff --git a/glance.yaml b/glance.yaml
index b63d12e..2980e6a 100644 (file)
--- a/glance.yaml
+++ b/glance.yaml
@@ -1,5 +1,5 @@
 HeatTemplateFormatVersion: '2012-12-12'
-Description: 'HEAT Template - Glance'
+Description: 'Glance'
 Parameters:
   KeyName: 
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
@@ -19,15 +19,24 @@ Parameters:
   ServicePassword:
     Description: admin_password for setting up auth in keystone.
     Type: String
-  TemplateURL:
+  RabbitHost:
+    Type: String
+  RabbitPassword:
     Type: String
-    Default: https://raw.github.com/openstack-ops/templates/master/
 Resources:
-  GlanceUser:
-    Type: AWS::CloudFormation::Stack
-    TemplateURL: {Fn::Join: [ {Ref: TemplateURL} , 'generic-user.yaml' ]}
-    Parameters:
-      AccessList: [ Glance ]
+  AccessPolicy:
+    Type: OS::Heat::AccessPolicy
+    Properties:
+      AllowedResources: [ Glance ]
+  User:
+    Type: AWS::IAM::User
+    Properties:
+      Policies: [ { Ref: AccessPolicy } ]
+  Key:
+    Type: AWS::IAM::AccessKey
+    Properties:
+      UserName:
+        Ref: User
   Glance:
     Type: AWS::EC2::Instance
     Properties:
@@ -36,12 +45,13 @@ Resources:
       InstanceType: {Ref: InstanceType}
       KeyName: {Ref: KeyName}
     Metadata:
+      OpenStack::Role: stateless
       OpenStack::ImageBuilder::Elements: [ glance ]
       heat: 
         access_key_id:
-          Fn::GetAtt: [ GlanceUser, AccessKeyId ]
+          Ref: Key
         secret_key:
-          Fn::GetAtt: [ GlanceUser, SecretAccessKey ]
+          Fn::GetAtt: [ Key, SecretAccessKey ]
         stack:
           name: {Ref: 'AWS::StackName'}
           region: {Ref: 'AWS::Region'}
@@ -55,5 +65,6 @@ Resources:
       rabbit:
         host: {Ref: RabbitHost}
         password: {Ref: RabbitPassword}
-      swift.store_user: ''
-      swift.store_key: ''
+      swift:
+        store_user: ''
+        store_key: ''