aboutsummaryrefslogtreecommitdiff
path: root/docker/common/ceilometer/ceilometer-base
diff options
context:
space:
mode:
authorSwapnil Kulkarni <me@coolsvap.net>2015-07-20 11:05:18 +0000
committerSwapnil Kulkarni <me@coolsvap.net>2015-07-29 18:08:50 +0000
commit1c147e4def0605e64a41916b71a9f2e675a0cbcf (patch)
tree11ec1e7ffbc134ee5c9feed4cecfaca0588a2acc /docker/common/ceilometer/ceilometer-base
parent9f3b2ddf173bcab10cf6516702fce690c11431cf (diff)
downloadkolla-1c147e4def0605e64a41916b71a9f2e675a0cbcf.tar.gz
kolla-1c147e4def0605e64a41916b71a9f2e675a0cbcf.zip
Update service helper scripts for variable changes
- Updated the required variables to be sorted so that they are better visible one on each line - Removed variable defaults from each service scripts and added them to tools/genenv file which holds all default values Change-Id: Ia7b1b08ba3f963b46b81434ce84f476d56890a93 Closes-Bug: #1476494 Closes-Bug: #1467652
Diffstat (limited to 'docker/common/ceilometer/ceilometer-base')
-rw-r--r--docker/common/ceilometer/ceilometer-base/config-ceilometer.sh14
1 files changed, 4 insertions, 10 deletions
diff --git a/docker/common/ceilometer/ceilometer-base/config-ceilometer.sh b/docker/common/ceilometer/ceilometer-base/config-ceilometer.sh
index 4161e48df..e01ebccc2 100644
--- a/docker/common/ceilometer/ceilometer-base/config-ceilometer.sh
+++ b/docker/common/ceilometer/ceilometer-base/config-ceilometer.sh
@@ -3,17 +3,11 @@
set -e
. /opt/kolla/kolla-common.sh
-: ${CEILOMETER_DB_USER:=ceilometer}
-: ${CEILOMETER_DB_NAME:=ceilometer}
-: ${KEYSTONE_AUTH_PROTOCOL:=http}
-: ${CEILOMETER_KEYSTONE_USER:=admin}
-: ${CEILOMETER_ADMIN_PASSWORD:=kolla}
-: ${ADMIN_TENANT_NAME:=admin}
-: ${METERING_SECRET:=ceilometer}
-: ${RABBIT_PASSWORD:=guest}
+check_required_vars KEYSTONE_ADMIN_SERVICE_HOST \
+ KEYSTONE_ADMIN_SERVICE_PORT \
+ KEYSTONE_ADMIN_TOKEN \
+ KEYSTONE_PUBLIC_SERVICE_HOST
-check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
- KEYSTONE_ADMIN_SERVICE_PORT KEYSTONE_PUBLIC_SERVICE_HOST
dump_vars
cat > /openrc <<EOF