diff options
| author | Martin André <martin.andre@kvhasia.com> | 2014-12-01 14:50:58 +0900 |
|---|---|---|
| committer | Martin André <martin.andre@kvhasia.com> | 2015-01-19 16:29:59 +0900 |
| commit | 91ca8d4b00c632bcf7a2a9903aa4cf584fee27e9 (patch) | |
| tree | ba76b5a063dac400dcb6ab5cb0654b808fbf8e0b /docker/heat | |
| parent | 9723a796d3ccdf3d898ae0612f48a4ec1fa91d4f (diff) | |
| download | kolla-91ca8d4b00c632bcf7a2a9903aa4cf584fee27e9.tar.gz kolla-91ca8d4b00c632bcf7a2a9903aa4cf584fee27e9.zip | |
Cleanup required variables checks for all containers
This allows Kubernetes to reschedule containers in case a required
variable is missing, for example when the Kubernetes pod is started
before the service.
The checks were cleaned using the following method:
* remove duplicates
* remove check for variables that get a default value in the same file
* check for all variables used in the file
* check for required services when it is obvious.
Change-Id: Ib7e0530c410c61f828d36efe8925a20dc9781eab
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 |