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-base | |
| 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-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 \ |