From dbddef4f7840caed6cf79eb39f721e1f29426481 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Thu, 19 Mar 2015 20:39:47 -0700
Subject: Improve Heat integration

Generate Heat environment variables.
Rename yml file to api and engine to follow other service conventions.
Add heat to compose/start
Modify integration guide to include new variables.

Change-Id: I058d829901881e28d6f4785f59fcf778058241e4
---
 compose/heat-api-engine.yml | 14 ++++++++++++++
 compose/heat.yaml           | 14 --------------
 docs/integration-guide.md   |  4 ++++
 tools/genenv                | 10 ++++++++++
 tools/start                 |  3 +++
 5 files changed, 31 insertions(+), 14 deletions(-)
 create mode 100644 compose/heat-api-engine.yml
 delete mode 100644 compose/heat.yaml

diff --git a/compose/heat-api-engine.yml b/compose/heat-api-engine.yml
new file mode 100644
index 000000000..962c36348
--- /dev/null
+++ b/compose/heat-api-engine.yml
@@ -0,0 +1,14 @@
+heatapi:
+  image: kollaglue/centos-rdo-heat-api
+  name: heat-api
+  net: "host"
+  restart: always
+  env_file:
+   - openstack.env
+heatengine:
+  image: kollaglue/centos-rdo-heat-engine
+  name: heat-engine
+  net: "host"
+  restart: always
+  env_file:
+   - openstack.env
\ No newline at end of file
diff --git a/compose/heat.yaml b/compose/heat.yaml
deleted file mode 100644
index 962c36348..000000000
--- a/compose/heat.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heatapi:
-  image: kollaglue/centos-rdo-heat-api
-  name: heat-api
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
-heatengine:
-  image: kollaglue/centos-rdo-heat-engine
-  name: heat-engine
-  net: "host"
-  restart: always
-  env_file:
-   - openstack.env
\ No newline at end of file
diff --git a/docs/integration-guide.md b/docs/integration-guide.md
index d1127896d..72d8c705d 100644
--- a/docs/integration-guide.md
+++ b/docs/integration-guide.md
@@ -70,6 +70,10 @@ all containers.  This allows a simple method of ensuring every type of node
     NOVA_EC2_SERVICE_HOST=<IP> _ The IP Address wher ethe Nova EC2 service is hosted
     NOVA_KEYSTONE_PASSWORD=<password> - The Nova keystone password
     NOVA_KEYSTONE_USER=<nova> - The Nova keystone username
+    HEAT_DB_NAME=<heat> - The heat DB name
+    HEAT_DB_PASSWORD=<kolla> - The heat db password
+    HEAT_KEYSTONE_PASSWORD=<heat> - The keystone password for the heat user
+    HEAT_API_SERVICE_HOST=<IP> - The IP Address where the Heat API service is hosted
     PUBLIC_INTERFACE=<eth1> - The nova public interface
     PUBLIC_IP=<Host IP Address> - The IP Address of this host
     RABBITMQ_PASS=<rabbit> - The rabbitmq password used to join AMQP
diff --git a/tools/genenv b/tools/genenv
index 91ac42cc4..61627f3ff 100755
--- a/tools/genenv
+++ b/tools/genenv
@@ -62,6 +62,12 @@ NOVA_PUBLIC_INTERFACE=$MY_DEV
 NOVA_FLAT_INTERFACE=$MY_DEV
 CONFIG_NETWORK=True
 
+# Heat
+HEAT_DB_NAME=heat
+HEAT_DB_PASSWORD=kolla
+HEAT_KEYSTONE_PASSWORD=heat
+HEAT_API_SERVICE_HOST=$HOST_IP
+
 cat > ./openrc <<EOF
 export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0"
 export OS_USERNAME=$ADMIN_TENANT_NAME
@@ -99,6 +105,10 @@ NOVA_EC2_API_SERVICE_HOST=$NOVA_EC2_SERVICE_HOST
 NOVA_EC2_SERVICE_HOST=$NOVA_EC2_SERVICE_HOST
 NOVA_KEYSTONE_PASSWORD=$NOVA_KEYSTONE_PASSWORD
 NOVA_KEYSTONE_USER=$NOVA_KEYSTONE_USER
+HEAT_DB_NAME=$HEAT_DB_NAME
+HEAT_DB_PASSWORD=$HEAT_DB_PASSWORD
+HEAT_KEYSTONE_PASSWORD=$HEAT_KEYSTONE_PASSWORD
+HEAT_API_SERVICE_HOST=$HEAT_API_SERVICE_HOST
 PUBLIC_INTERFACE=$NOVA_PUBLIC_INTERFACE
 PUBLIC_IP=$HOST_IP
 PUBLIC_IP=$PUBLIC_IP
diff --git a/tools/start b/tools/start
index 887ec8ab1..79527b2e5 100755
--- a/tools/start
+++ b/tools/start
@@ -46,6 +46,9 @@ docker-compose -f ./compose/nova-api-conductor-scheduler.yml up -d
 echo Starting nova compute with nova networking.
 docker-compose -f ./compose/nova-compute-network.yml up -d
 
+echo Starting heat.
+docker-compose -f ./compose/heat-api-engine.yml up -d
+
 IMAGE_URL=http://download.cirros-cloud.net/0.3.3/
 IMAGE=cirros-0.3.3-x86_64-disk.img
 if ! [ -f "$IMAGE" ]; then
-- 
cgit v1.2.3