From 1962bfb16e70835af83d93155018933dec866f30 Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Tue, 9 Jun 2015 18:55:44 -0400 Subject: Fix Heat container env vars and dependencies This commit adds a few dependencies (that are actually packaging errors) present in all of the containers, as well as specifically in heat-engine. Some of the environment variables were not set correctly in the heat-api-cfn container. The environment variables have also been correctly added to the genenv script. Also removed duplicated compose file data already present in heat-api-engine. Closes-Bug: #1461872 Change-Id: I9631d1bc6ea42425272570a9dda8cbf5edcef4f3 --- tools/genenv | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/genenv b/tools/genenv index b1a13fd37..ba77c2fc8 100755 --- a/tools/genenv +++ b/tools/genenv @@ -126,9 +126,13 @@ NEUTRON_SHARED_SECRET=sharedsecret # Heat HEAT_DB_NAME=heat HEAT_DB_PASSWORD=kolla +HEAT_KEYSTONE_USER=heat HEAT_KEYSTONE_PASSWORD=heat +HEAT_CFN_KEYSTONE_USER=heat-cfn +HEAT_CFN_KEYSTONE_PASSWORD=heat HEAT_API_SERVICE_HOST=$HOST_IP HEAT_API_CFN_SERVICE_HOST=$HOST_IP +HEAT_API_CFN_SERVICE_PORT=8000 HEAT_API_CFN_URL_HOST=$HOST_IP # Magnum @@ -267,8 +271,14 @@ NEUTRON_FLAT_NETWORK_NAME=$NEUTRON_FLAT_NETWORK_NAME NEUTRON_FLAT_NETWORK_INTERFACE=$NEUTRON_FLAT_NETWORK_INTERFACE HEAT_DB_NAME=$HEAT_DB_NAME HEAT_DB_PASSWORD=$HEAT_DB_PASSWORD +HEAT_KEYSTONE_USER=$HEAT_KEYSTONE_USER HEAT_KEYSTONE_PASSWORD=$HEAT_KEYSTONE_PASSWORD +HEAT_CFN_KEYSTONE_USER=$HEAT_CFN_KEYSTONE_USER +HEAT_CFN_KEYSTONE_PASSWORD=$HEAT_CFN_KEYSTONE_PASSWORD HEAT_API_SERVICE_HOST=$HEAT_API_SERVICE_HOST +HEAT_API_CFN_SERVICE_HOST=$HEAT_API_CFN_SERVICE_HOST +HEAT_API_CFN_SERVICE_PORT=$HEAT_API_CFN_SERVICE_PORT +HEAT_API_CFN_URL_HOST=$HEAT_API_CFN_URL_HOST MAGNUM_DB_NAME=$MAGNUM_DB_NAME MAGNUM_DB_PASSWORD=$MAGNUM_DB_PASSWORD MAGNUM_KEYSTONE_PASSWORD=$MAGNUM_KEYSTONE_PASSWORD @@ -281,7 +291,6 @@ RABBITMQ_SERVICE_HOST=$RABBITMQ_SERVICE_HOST RABBITMQ_USER=$RABBIT_USER RABBIT_PASSWORD=$RABBIT_PASSWORD RABBIT_USERID=$RABBIT_USER -HEAT_API_CFN_SERVICE_HOST=$HEAT_API_CFN_SERVICE_HOST DESIGNATE_DB_NAME=$DESIGNATE_DB_NAME DESIGNATE_DB_USER=$DESIGNATE_DB_USER DESIGNATE_DB_PASSWORD=$DESIGNATE_DB_PASSWORD -- cgit v1.2.3