diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-27 18:02:04 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-28 00:50:29 -0700 |
| commit | 59138665acc96c6155d3046f10db32c38557e8b7 (patch) | |
| tree | 3bee2eeb173b4c141aacac2a8b48d5d02104472f /docker | |
| parent | 19318667ba1175c684961e044f1c798f6f9768a6 (diff) | |
| download | kolla-59138665acc96c6155d3046f10db32c38557e8b7.tar.gz kolla-59138665acc96c6155d3046f10db32c38557e8b7.zip | |
Move scripts for gnocchi to docker_templates
Change-Id: Iabff693470d5b522cd82915ba3b7298d286c5fa4
Partially-Implements: blueprint remove-docker-dir
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/common/gnocchi/gnocchi-api/config-external.sh | 10 | ||||
| -rwxr-xr-x | docker/common/gnocchi/gnocchi-api/start.sh | 21 | ||||
| -rw-r--r-- | docker/common/gnocchi/gnocchi-statsd/config-external.sh | 10 | ||||
| -rwxr-xr-x | docker/common/gnocchi/gnocchi-statsd/start.sh | 14 |
4 files changed, 0 insertions, 55 deletions
diff --git a/docker/common/gnocchi/gnocchi-api/config-external.sh b/docker/common/gnocchi/gnocchi-api/config-external.sh deleted file mode 100644 index 59639ba63..000000000 --- a/docker/common/gnocchi/gnocchi-api/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/gnocchi-api/gnocchi-api.conf" -TARGET="/etc/gnocchi/gnocchi-api.conf" -OWNER="gnocchi" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/gnocchi/gnocchi-api/start.sh b/docker/common/gnocchi/gnocchi-api/start.sh deleted file mode 100755 index 657368a27..000000000 --- a/docker/common/gnocchi/gnocchi-api/start.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -set -o errexit - -CMD="/usr/bin/gnocchi-api" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -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 "gnocchi-manage db_sync" gnocchi - exit 0 -fi - -exec $CMD $ARGS - diff --git a/docker/common/gnocchi/gnocchi-statsd/config-external.sh b/docker/common/gnocchi/gnocchi-statsd/config-external.sh deleted file mode 100644 index 59639ba63..000000000 --- a/docker/common/gnocchi/gnocchi-statsd/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/gnocchi-api/gnocchi-api.conf" -TARGET="/etc/gnocchi/gnocchi-api.conf" -OWNER="gnocchi" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/gnocchi/gnocchi-statsd/start.sh b/docker/common/gnocchi/gnocchi-statsd/start.sh deleted file mode 100755 index 636e71323..000000000 --- a/docker/common/gnocchi/gnocchi-statsd/start.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -set -o errexit - -CMD="/usr/bin/gnocchi-statsd" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS - |