diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-27 17:28:40 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-28 00:50:29 -0700 |
| commit | 8930c12922509a52c6ef8d0475ca5adefb61ea27 (patch) | |
| tree | 28a69c29bf68b72cfd35779e7d0346ee2c3da766 /docker_templates/ceilometer/ceilometer-api | |
| parent | 3ca9ae380ee20a2c9d374ea2ddc0dab2841d859a (diff) | |
| download | kolla-8930c12922509a52c6ef8d0475ca5adefb61ea27.tar.gz kolla-8930c12922509a52c6ef8d0475ca5adefb61ea27.zip | |
Move scripts for ceilometer to docker_templates
Change-Id: I4b4707b2d30175fcb93836edbe02c154a211c116
Partially-Implements: blueprint remove-docker-dir
Diffstat (limited to 'docker_templates/ceilometer/ceilometer-api')
| -rw-r--r--[l---------] | docker_templates/ceilometer/ceilometer-api/config-external.sh | 11 | ||||
| -rwxr-xr-x[l---------] | docker_templates/ceilometer/ceilometer-api/start.sh | 22 |
2 files changed, 31 insertions, 2 deletions
diff --git a/docker_templates/ceilometer/ceilometer-api/config-external.sh b/docker_templates/ceilometer/ceilometer-api/config-external.sh index ba6e97d0a..2835bd5aa 120000..100644 --- a/docker_templates/ceilometer/ceilometer-api/config-external.sh +++ b/docker_templates/ceilometer/ceilometer-api/config-external.sh @@ -1 +1,10 @@ -../../../docker/common/ceilometer/ceilometer-api/config-external.sh
\ No newline at end of file +#!/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_templates/ceilometer/ceilometer-api/start.sh b/docker_templates/ceilometer/ceilometer-api/start.sh index 0ed8e50d7..0f660e025 120000..100755 --- a/docker_templates/ceilometer/ceilometer-api/start.sh +++ b/docker_templates/ceilometer/ceilometer-api/start.sh @@ -1 +1,21 @@ -../../../docker/common/ceilometer/ceilometer-api/start.sh
\ No newline at end of file +#!/bin/bash + +set -o errexit + +CMD="/usr/bin/ceilometer-api" +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 + su -s /bin/sh -c "ceilometer-manage db_sync" ceilometer + exit 0 +fi + +exec $CMD $ARGS |