From dbddef4f7840caed6cf79eb39f721e1f29426481 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Thu, 19 Mar 2015 20:39:47 -0700 Subject: [PATCH] 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.yaml => heat-api-engine.yml} | 0 docs/integration-guide.md | 4 ++++ tools/genenv | 10 ++++++++++ tools/start | 3 +++ 4 files changed, 17 insertions(+) rename compose/{heat.yaml => heat-api-engine.yml} (100%) diff --git a/compose/heat.yaml b/compose/heat-api-engine.yml similarity index 100% rename from compose/heat.yaml rename to compose/heat-api-engine.yml diff --git a/docs/integration-guide.md b/docs/integration-guide.md index d1127896d4..72d8c705d5 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= _ The IP Address wher ethe Nova EC2 service is hosted NOVA_KEYSTONE_PASSWORD= - The Nova keystone password NOVA_KEYSTONE_USER= - The Nova keystone username + HEAT_DB_NAME= - The heat DB name + HEAT_DB_PASSWORD= - The heat db password + HEAT_KEYSTONE_PASSWORD= - The keystone password for the heat user + HEAT_API_SERVICE_HOST= - The IP Address where the Heat API service is hosted PUBLIC_INTERFACE= - The nova public interface PUBLIC_IP= - The IP Address of this host RABBITMQ_PASS= - The rabbitmq password used to join AMQP diff --git a/tools/genenv b/tools/genenv index 91ac42cc43..61627f3ff4 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 <