Use native server resource in overcloud

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

diff --git a/heat.yaml b/heat.yaml
index 4c64983..d4c3eef 100644 (file)
--- a/heat.yaml
+++ b/heat.yaml
@@ -1,5 +1,5 @@
 HeatTemplateFormatVersion: '2012-12-12'
-Description: 'HEAT Template - Heat Engine and API'
+Description: 'Heat Engine and API'
 Parameters:
   KeyName: 
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
@@ -30,9 +30,6 @@ Parameters:
   AvailabilityZones:
     Type: List
     Default: [ 1 ]
-  TemplateURL:
-    Type: String
-    Default: https://raw.github.com/openstack-ops/templates/master/
 Resources:
   EngineAccessPolicy:
     Type: OS::Heat::AccessPolicy
@@ -83,7 +80,6 @@ Resources:
         {Ref: HeatApiImage}
       InstanceType: {Ref: InstanceType}
       KeyName: {Ref: KeyName}
-      UserData: "#!/bin/bash\ntouch /tmp/userdata-finished\necho Userdata finished $(date)\n"
   HeatAPI:
     Type: OS::Heat::InstanceGroup
     Properties:
@@ -96,6 +92,8 @@ Resources:
       ImageId:
         {Ref: HeatEngineImage}
     Metadata:
+      OpenStack::Role: stateful
+      OpenStack::ImageBuilder::Elements: [ heat-engine ]
       heat:
         rpc_backend: heat.openstack.common.rpc.impl_kombu
         rabbit: