aboutsummaryrefslogtreecommitdiff
path: root/docker/common/ceilometer/ceilometer-notification
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-08-07 08:54:23 -0700
committerSteven Dake <stdake@cisco.com>2015-08-07 22:31:06 -0700
commitb84abb9425afebddf0109ecb36e383c2a228b5a8 (patch)
tree6fcf21f2759e10df5845c1ba88639b9a6690ca00 /docker/common/ceilometer/ceilometer-notification
parent115bc899665a6c63cdcb429df36ffa86af1eb22c (diff)
downloadkolla-b84abb9425afebddf0109ecb36e383c2a228b5a8.tar.gz
kolla-b84abb9425afebddf0109ecb36e383c2a228b5a8.zip
Remove config-internal from ceilometer
Change-Id: I273c91d1300c1b30f7263195657e3510975f6f50 Partially-Implements: blueprint remove-config-internal
Diffstat (limited to 'docker/common/ceilometer/ceilometer-notification')
-rwxr-xr-xdocker/common/ceilometer/ceilometer-notification/config-internal.sh9
-rwxr-xr-xdocker/common/ceilometer/ceilometer-notification/start.sh2
2 files changed, 1 insertions, 10 deletions
diff --git a/docker/common/ceilometer/ceilometer-notification/config-internal.sh b/docker/common/ceilometer/ceilometer-notification/config-internal.sh
deleted file mode 100755
index 939734549..000000000
--- a/docker/common/ceilometer/ceilometer-notification/config-internal.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. /opt/kolla/kolla-common.sh
-. /opt/kolla/config-ceilometer.sh
-
-
-exec /usr/bin/ceilometer-agent-notification
diff --git a/docker/common/ceilometer/ceilometer-notification/start.sh b/docker/common/ceilometer/ceilometer-notification/start.sh
index 1fc97ff21..8ce4b4488 100755
--- a/docker/common/ceilometer/ceilometer-notification/start.sh
+++ b/docker/common/ceilometer/ceilometer-notification/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