aboutsummaryrefslogtreecommitdiff
path: root/docker/ceilometer
diff options
context:
space:
mode:
Diffstat (limited to 'docker/ceilometer')
-rwxr-xr-xdocker/ceilometer/ceilometer-alarm/start.sh4
-rwxr-xr-xdocker/ceilometer/ceilometer-api/start.sh4
-rwxr-xr-xdocker/ceilometer/ceilometer-central/start.sh4
-rwxr-xr-xdocker/ceilometer/ceilometer-collector/start.sh4
-rwxr-xr-xdocker/ceilometer/ceilometer-compute/start.sh4
-rwxr-xr-xdocker/ceilometer/ceilometer-notification/start.sh4
6 files changed, 0 insertions, 24 deletions
diff --git a/docker/ceilometer/ceilometer-alarm/start.sh b/docker/ceilometer/ceilometer-alarm/start.sh
index ab5501b23..d98577e08 100755
--- a/docker/ceilometer/ceilometer-alarm/start.sh
+++ b/docker/ceilometer/ceilometer-alarm/start.sh
@@ -1,5 +1,4 @@
#!/bin/bash
-
set -o errexit
CMD="/usr/bin/ceilometer-alarm"
@@ -8,7 +7,4 @@ ARGS=""
# Loading common functions.
source /opt/kolla/kolla-common.sh
-# Execute config strategy
-set_configs
-
exec $CMD $ARGS
diff --git a/docker/ceilometer/ceilometer-api/start.sh b/docker/ceilometer/ceilometer-api/start.sh
index 0f660e025..6ba3cc37d 100755
--- a/docker/ceilometer/ceilometer-api/start.sh
+++ b/docker/ceilometer/ceilometer-api/start.sh
@@ -1,5 +1,4 @@
#!/bin/bash
-
set -o errexit
CMD="/usr/bin/ceilometer-api"
@@ -8,9 +7,6 @@ ARGS=""
# Loading common functions.
source /opt/kolla/kolla-common.sh
-# Config-internal script exec out of this function, it does not return here.
-set_configs
-
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
# of the KOLLA_BOOTSTRAP variable being set, including empty.
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
diff --git a/docker/ceilometer/ceilometer-central/start.sh b/docker/ceilometer/ceilometer-central/start.sh
index f2980a4d5..e074febc9 100755
--- a/docker/ceilometer/ceilometer-central/start.sh
+++ b/docker/ceilometer/ceilometer-central/start.sh
@@ -1,5 +1,4 @@
#!/bin/bash
-
set -o errexit
CMD="/usr/bin/ceilometer-agent-central"
@@ -8,7 +7,4 @@ ARGS=""
# Loading common functions.
source /opt/kolla/kolla-common.sh
-# Execute config strategy
-set_configs
-
exec $CMD $ARGS
diff --git a/docker/ceilometer/ceilometer-collector/start.sh b/docker/ceilometer/ceilometer-collector/start.sh
index 3a59c17d1..585e4d7f5 100755
--- a/docker/ceilometer/ceilometer-collector/start.sh
+++ b/docker/ceilometer/ceilometer-collector/start.sh
@@ -1,5 +1,4 @@
#!/bin/bash
-
set -o errexit
CMD="/usr/bin/ceilometer-collector"
@@ -8,7 +7,4 @@ ARGS=""
# Loading common functions.
source /opt/kolla/kolla-common.sh
-# Execute config strategy
-set_configs
-
exec $CMD $ARGS
diff --git a/docker/ceilometer/ceilometer-compute/start.sh b/docker/ceilometer/ceilometer-compute/start.sh
index 19d90be2f..f17a32709 100755
--- a/docker/ceilometer/ceilometer-compute/start.sh
+++ b/docker/ceilometer/ceilometer-compute/start.sh
@@ -1,5 +1,4 @@
#!/bin/bash
-
set -o errexit
CMD="/usr/bin/ceilometer-agent-compute"
@@ -8,7 +7,4 @@ ARGS=""
# Loading common functions.
source /opt/kolla/kolla-common.sh
-# Execute config strategy
-set_configs
-
exec $CMD $ARGS
diff --git a/docker/ceilometer/ceilometer-notification/start.sh b/docker/ceilometer/ceilometer-notification/start.sh
index 8ce4b4488..a3421acaf 100755
--- a/docker/ceilometer/ceilometer-notification/start.sh
+++ b/docker/ceilometer/ceilometer-notification/start.sh
@@ -1,5 +1,4 @@
#!/bin/bash
-
set -o errexit
CMD="/usr/bin/ceilometer-agent-notification"
@@ -8,7 +7,4 @@ ARGS=""
# Loading common functions.
source /opt/kolla/kolla-common.sh
-# Execute config strategy
-set_configs
-
exec $CMD $ARGS