aboutsummaryrefslogtreecommitdiff
path: root/docker/ceilometer/ceilometer-api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-09-28 10:34:58 +0000
committerGerrit Code Review <review@openstack.org>2015-09-28 10:34:58 +0000
commitaadbbcbee0d19f60d7a8f6d3d04f61c1f1e48f30 (patch)
treea131cd99311e41a6656773095e8bf02561a6b856 /docker/ceilometer/ceilometer-api
parent762b24cc1a29f6ba803ee2045d41f98d6adbed05 (diff)
parent160f1cc0116bf93cfceffeb0149e525ba08eed3f (diff)
downloadkolla-aadbbcbee0d19f60d7a8f6d3d04f61c1f1e48f30.tar.gz
kolla-aadbbcbee0d19f60d7a8f6d3d04f61c1f1e48f30.zip
Merge "remove set_configs"
Diffstat (limited to 'docker/ceilometer/ceilometer-api')
-rwxr-xr-xdocker/ceilometer/ceilometer-api/start.sh4
1 files changed, 0 insertions, 4 deletions
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