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-central | |
| 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-central')
| -rw-r--r-- | docker/ceilometer/ceilometer-central/start.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/ceilometer/ceilometer-central/start.sh b/docker/ceilometer/ceilometer-central/start.sh index a40a3dde0..ec9951c90 100644 --- a/docker/ceilometer/ceilometer-central/start.sh +++ b/docker/ceilometer/ceilometer-central/start.sh @@ -3,10 +3,10 @@ . /opt/kolla/kolla-common.sh . /opt/kolla/config-ceilometer.sh -check_required_vars KEYSTONE_AUTH_PROTOCOL CEILOMETER_KEYSTONE_USER CEILOMETER_ADMIN_PASSWORD ADMIN_TENANT_NAME +check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_AUTH_PROTOCOL \ + KEYSTONE_ADMIN_SERVICE_HOST KEYSTONE_ADMIN_SERVICE_PORT check_for_keystone -check_for_db export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v2.0" |