diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-26 20:24:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-26 20:24:58 +0000 |
| commit | 344495d292237939eeb80cfb69b8cff284b1065a (patch) | |
| tree | b5c1c28365c59046e23099281ddb818a6d5376e3 /docker/common | |
| parent | b2aeebd62e6fbc9a91f286c16e7f159bbb0e1042 (diff) | |
| parent | 1d9c5f914c77f4b8e6804ad7a1a40f9c8c40d34e (diff) | |
| download | kolla-344495d292237939eeb80cfb69b8cff284b1065a.tar.gz kolla-344495d292237939eeb80cfb69b8cff284b1065a.zip | |
Merge "Add missing openstack.env vars and export to heat"
Diffstat (limited to 'docker/common')
| -rwxr-xr-x | docker/common/heat/heat-base/config-heat.sh | 9 | ||||
| -rwxr-xr-x | docker/common/heat/heat-engine/start.sh | 1 |
2 files changed, 7 insertions, 3 deletions
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 |