diff options
| author | Swapnil Kulkarni <me@coolsvap.net> | 2015-07-03 06:14:29 +0000 |
|---|---|---|
| committer | Swapnil Kulkarni <me@coolsvap.net> | 2015-07-09 12:13:25 -0400 |
| commit | 4c25113d30ae951e7d3a2f23fa5758e62ead8a8f (patch) | |
| tree | 2ecdbe5341be0cdd4b0678b7ecc13d37e4b9c57d /docker/common/ceilometer/ceilometer-central | |
| parent | fcda6a06d8eee9d3f3199962b36a04a8c702072c (diff) | |
| download | kolla-4c25113d30ae951e7d3a2f23fa5758e62ead8a8f.tar.gz kolla-4c25113d30ae951e7d3a2f23fa5758e62ead8a8f.zip | |
Add config-internal/config-external for Ceilometer
Partially Implements: Blueprint standard-start
Change-Id: I0c9fea2014a23ca0b08f9a0946472cc877edacbc
Diffstat (limited to 'docker/common/ceilometer/ceilometer-central')
3 files changed, 32 insertions, 8 deletions
diff --git a/docker/common/ceilometer/ceilometer-central/config-external.sh b/docker/common/ceilometer/ceilometer-central/config-external.sh new file mode 100644 index 000000000..2835bd5aa --- /dev/null +++ b/docker/common/ceilometer/ceilometer-central/config-external.sh @@ -0,0 +1,10 @@ +#!/bin/bash +SOURCE="/opt/kolla/ceilometer/ceilometer.conf" +TARGET="/etc/ceilometer/ceilometer.conf" +OWNER="ceilometer" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker/common/ceilometer/ceilometer-central/config-internal.sh b/docker/common/ceilometer/ceilometer-central/config-internal.sh new file mode 100644 index 000000000..76f9a1fc2 --- /dev/null +++ b/docker/common/ceilometer/ceilometer-central/config-internal.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +. /opt/kolla/kolla-common.sh +. /opt/kolla/config-ceilometer.sh + +check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_AUTH_PROTOCOL \ + KEYSTONE_ADMIN_SERVICE_HOST KEYSTONE_ADMIN_SERVICE_PORT + +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 76f9a1fc2..f9c317828 100644 --- a/docker/common/ceilometer/ceilometer-central/start.sh +++ b/docker/common/ceilometer/ceilometer-central/start.sh @@ -1,14 +1,14 @@ #!/bin/bash -. /opt/kolla/kolla-common.sh -. /opt/kolla/config-ceilometer.sh +set -o errexit -check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_AUTH_PROTOCOL \ - KEYSTONE_ADMIN_SERVICE_HOST KEYSTONE_ADMIN_SERVICE_PORT +CMD="/usr/bin/ceilometer-agent-central" +ARGS="" -fail_unless_os_service_running keystone +# Loading common functions. +source /opt/kolla/kolla-common.sh -export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" -export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v2.0" +# Config-internal script exec out of this function, it does not return here. +set_configs -exec /usr/bin/ceilometer-agent-central +exec $CMD $ARGS |