aboutsummaryrefslogtreecommitdiff
path: root/docker/common/ceilometer/ceilometer-central
diff options
context:
space:
mode:
Diffstat (limited to 'docker/common/ceilometer/ceilometer-central')
-rwxr-xr-xdocker/common/ceilometer/ceilometer-central/config-internal.sh16
-rwxr-xr-xdocker/common/ceilometer/ceilometer-central/start.sh2
2 files changed, 1 insertions, 17 deletions
diff --git a/docker/common/ceilometer/ceilometer-central/config-internal.sh b/docker/common/ceilometer/ceilometer-central/config-internal.sh
deleted file mode 100755
index 1cc8d46cf..000000000
--- a/docker/common/ceilometer/ceilometer-central/config-internal.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-. /opt/kolla/kolla-common.sh
-. /opt/kolla/config-ceilometer.sh
-
-check_required_vars KEYSTONE_ADMIN_SERVICE_HOST \
- KEYSTONE_ADMIN_SERVICE_PORT \
- KEYSTONE_AUTH_PROTOCOL \
- KEYSTONE_ADMIN_TOKEN
-
-fail_unless_os_service_running keystone
-
-export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
-export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v2.0"
-
-exec /usr/bin/ceilometer-agent-central
diff --git a/docker/common/ceilometer/ceilometer-central/start.sh b/docker/common/ceilometer/ceilometer-central/start.sh
index f9c317828..f2980a4d5 100755
--- a/docker/common/ceilometer/ceilometer-central/start.sh
+++ b/docker/common/ceilometer/ceilometer-central/start.sh
@@ -8,7 +8,7 @@ ARGS=""
# Loading common functions.
source /opt/kolla/kolla-common.sh
-# Config-internal script exec out of this function, it does not return here.
+# Execute config strategy
set_configs
exec $CMD $ARGS