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-compute | |
| 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-compute')
| -rw-r--r-- | docker/ceilometer/ceilometer-compute/start.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/ceilometer/ceilometer-compute/start.sh b/docker/ceilometer/ceilometer-compute/start.sh index d9b62be82..5b610b28a 100644 --- a/docker/ceilometer/ceilometer-compute/start.sh +++ b/docker/ceilometer/ceilometer-compute/start.sh @@ -4,7 +4,7 @@ . /opt/kolla/config-ceilometer.sh -check_required_vars KEYSTONE_ADMIN_TOKEN RABBITMQ_SERVICE_HOST KEYSTONE_AUTH_PROTOCOL CEILOMETER_KEYSTONE_USER ADMIN_TENANT_NAME +check_required_vars KEYSTONE_ADMIN_TOKEN RABBITMQ_SERVICE_HOST RABBIT_PASSWORD check_for_keystone @@ -19,7 +19,7 @@ crudini --set /etc/nova/nova.conf DEFAULT notification_driver ceilometer.compute cfg=/etc/ceilometer/ceilometer.conf crudini --set $cfg publisher_rpc metering_secret ${KEYSTONE_ADMIN_TOKEN} crudini --set $cfg rabbit_host ${RABBITMQ_SERVICE_HOST} -crudini --set $cfg rabbit_password ${RABBITMQ_PASS} +crudini --set $cfg rabbit_password ${RABBIT_PASSWORD} exec /usr/bin/ceilometer-agent-compute |