diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-02-06 19:08:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-02-06 19:08:46 +0000 |
| commit | 26b564dd06890862e268ea72b987bcb5ebf4bdb2 (patch) | |
| tree | 726b9e932f6e5e711583bf9556100d4a5ad15e7d /docker/ceilometer/ceilometer-compute | |
| parent | e91aafc75a656f108f97d6adb69fe132923b9119 (diff) | |
| parent | 91ca8d4b00c632bcf7a2a9903aa4cf584fee27e9 (diff) | |
| download | kolla-26b564dd06890862e268ea72b987bcb5ebf4bdb2.tar.gz kolla-26b564dd06890862e268ea72b987bcb5ebf4bdb2.zip | |
Merge "Cleanup required variables checks for all containers"
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 |