diff options
Diffstat (limited to 'docker/heat')
| -rwxr-xr-x | docker/heat/heat-base/config-heat.sh | 5 | ||||
| -rwxr-xr-x | docker/heat/heat-engine/start.sh | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/docker/heat/heat-base/config-heat.sh b/docker/heat/heat-base/config-heat.sh index c2837325c..3dcb1435a 100755 --- a/docker/heat/heat-base/config-heat.sh +++ b/docker/heat/heat-base/config-heat.sh @@ -13,7 +13,10 @@ set -e : ${RABBIT_USER:=guest} : ${RABBIT_PASSWORD:=guest} -check_required_vars HEAT_DB_PASSWORD HEAT_KEYSTONE_PASSWORD +check_required_vars HEAT_DB_PASSWORD HEAT_KEYSTONE_PASSWORD \ + KEYSTONE_PUBLIC_SERVICE_HOST RABBITMQ_SERVICE_HOST + +check_for_db dump_vars cat > /openrc <<EOF diff --git a/docker/heat/heat-engine/start.sh b/docker/heat/heat-engine/start.sh index 0ab9e4800..e9d3f9e41 100755 --- a/docker/heat/heat-engine/start.sh +++ b/docker/heat/heat-engine/start.sh @@ -3,8 +3,7 @@ . /opt/kolla/kolla-common.sh . /opt/kolla/config-heat.sh -check_required_vars MARIADB_SERVICE_HOST DB_ROOT_PASSWORD \ - HEAT_DB_NAME HEAT_DB_USER HEAT_DB_PASSWORD +check_required_vars HEAT_DB_NAME HEAT_DB_USER HEAT_DB_PASSWORD check_for_db mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF |
