Use native resource for nova-compute-instance

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

diff --git a/glance.yaml b/glance.yaml
index b5df07e..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,9 +19,6 @@ Parameters:
   ServicePassword:
     Description: admin_password for setting up auth in keystone.
     Type: String
-  TemplateURL:
-    Type: String
-    Default: https://raw.github.com/openstack-ops/templates/master/
   RabbitHost:
     Type: String
   RabbitPassword:
@@ -48,6 +45,7 @@ Resources:
       InstanceType: {Ref: InstanceType}
       KeyName: {Ref: KeyName}
     Metadata:
+      OpenStack::Role: stateless
       OpenStack::ImageBuilder::Elements: [ glance ]
       heat: 
         access_key_id:
@@ -67,5 +65,6 @@ Resources:
       rabbit:
         host: {Ref: RabbitHost}
         password: {Ref: RabbitPassword}
-      swift.store_user: ''
-      swift.store_key: ''
+      swift:
+        store_user: ''
+        store_key: ''