From 1d9c5f914c77f4b8e6804ad7a1a40f9c8c40d34e Mon Sep 17 00:00:00 2001
From: Michal Stachowski <michal.stachowski@intel.com>
Date: Fri, 26 Jun 2015 18:20:32 +0200
Subject: Add missing openstack.env vars and export to heat

Heat failed on heat-keystone-setup-domain because it requires openrc
style of env vars. Also, genenv missed Keystone port env vars.

There are several openrc instances that are using the keystone public
port, bug filed: https://bugs.launchpad.net/kolla/+bug/1469209

Change-Id: I03b57c43c38fb3ebded4d6f206161cf02fb4883d
Closes-Bug: #1469003
Co-Authored-by: Jeff Peeler <jpeeler@redhat.com>
---
 docker/common/heat/heat-base/config-heat.sh | 9 ++++++---
 docker/common/heat/heat-engine/start.sh     | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'docker')

diff --git a/docker/common/heat/heat-base/config-heat.sh b/docker/common/heat/heat-base/config-heat.sh
index 9275e5645..843221ccd 100755
--- a/docker/common/heat/heat-base/config-heat.sh
+++ b/docker/common/heat/heat-base/config-heat.sh
@@ -17,14 +17,17 @@ set -e
 check_required_vars HEAT_DB_PASSWORD HEAT_KEYSTONE_PASSWORD \
                     HEAT_API_CFN_URL_HOST HEAT_API_CFN_SERVICE_PORT \
                     KEYSTONE_PUBLIC_SERVICE_HOST KEYSTONE_PUBLIC_SERVICE_PORT \
-                    RABBITMQ_SERVICE_HOST MARIADB_SERVICE_HOST \
-                    HEAT_DOMAIN_PASS
+                    KEYSTONE_PUBLIC_SERVICE_PORT RABBITMQ_SERVICE_HOST \
+                    MARIADB_SERVICE_HOST HEAT_DOMAIN_PASS
 
 fail_unless_db
 dump_vars
 
+# this should use the keystone admin port
+# https://bugs.launchpad.net/kolla/+bug/1469209
 cat > /openrc <<EOF
-export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0"
+export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:\
+${KEYSTONE_PUBLIC_SERVICE_PORT}/v2.0"
 export OS_USERNAME="${HEAT_KEYSTONE_USER}"
 export OS_PASSWORD="${HEAT_KEYSTONE_PASSWORD}"
 export OS_TENANT_NAME="${ADMIN_TENANT_NAME}"
diff --git a/docker/common/heat/heat-engine/start.sh b/docker/common/heat/heat-engine/start.sh
index 16453a3be..0cafbc480 100755
--- a/docker/common/heat/heat-engine/start.sh
+++ b/docker/common/heat/heat-engine/start.sh
@@ -2,6 +2,7 @@
 
 . /opt/kolla/kolla-common.sh
 . /opt/kolla/config-heat.sh
+. /openrc
 
 check_required_vars HEAT_DB_NAME HEAT_DB_USER HEAT_DB_PASSWORD \
                     INIT_HEAT_DB HEAT_DOMAIN_PASS
-- 
cgit v1.2.3