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/ceilometer/ceilometer-base | |
| 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/ceilometer/ceilometer-base')
| -rw-r--r-- | docker/ceilometer/ceilometer-base/config-ceilometer.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/ceilometer/ceilometer-base/config-ceilometer.sh b/docker/ceilometer/ceilometer-base/config-ceilometer.sh index 87dcac653..9df45994a 100644 --- a/docker/ceilometer/ceilometer-base/config-ceilometer.sh +++ b/docker/ceilometer/ceilometer-base/config-ceilometer.sh @@ -10,8 +10,10 @@ set -e : ${CEILOMETER_ADMIN_PASSWORD:=kolla} : ${ADMIN_TENANT_NAME:=admin} : ${METERING_SECRET:=ceilometer} +: ${RABBIT_PASSWORD:=guest} -check_required_vars CEILOMETER_DB_PASSWORD KEYSTONE_ADMIN_TOKEN DB_ROOT_PASSWORD +check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ + KEYSTONE_ADMIN_SERVICE_PORT KEYSTONE_PUBLIC_SERVICE_HOST \ dump_vars cat > /openrc <<EOF @@ -27,7 +29,7 @@ crudini --set $cfg \ crudini --set $cfg \ DEFAULT rabbit_host ${RABBITMQ_SERVICE_HOST} crudini --set $cfg \ - DEFAULT rabbit_password ${RABBITMQ_PASS} + DEFAULT rabbit_password ${RABBIT_PASSWORD} crudini --set $cfg \ keystone_authtoken \ |