diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-27 17:59:18 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-28 00:50:29 -0700 |
| commit | 19318667ba1175c684961e044f1c798f6f9768a6 (patch) | |
| tree | 44af3189cc1f0b38ba178201508ddcbd6cceaf57 /docker | |
| parent | dc2869684afbdc715dc26b9feaf25f244ba6c1e8 (diff) | |
| download | kolla-19318667ba1175c684961e044f1c798f6f9768a6.tar.gz kolla-19318667ba1175c684961e044f1c798f6f9768a6.zip | |
Move scripts for glance to docker_templates
Change-Id: I6272caf3939a2e13a4599239d85020205ff7d9e3
Partially-Implements: blueprint remove-docker-dir
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/common/glance/glance-api/config-external.sh | 10 | ||||
| -rwxr-xr-x | docker/common/glance/glance-api/start.sh | 20 | ||||
| -rwxr-xr-x | docker/common/glance/glance-registry/config-external.sh | 10 | ||||
| -rwxr-xr-x | docker/common/glance/glance-registry/start.sh | 13 |
4 files changed, 0 insertions, 53 deletions
diff --git a/docker/common/glance/glance-api/config-external.sh b/docker/common/glance/glance-api/config-external.sh deleted file mode 100755 index ce5411738..000000000 --- a/docker/common/glance/glance-api/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/glance-api/glance-api.conf" -TARGET="/etc/glance/glance-api.conf" -OWNER="glance" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/glance/glance-api/start.sh b/docker/common/glance/glance-api/start.sh deleted file mode 100755 index ce3cb6d8b..000000000 --- a/docker/common/glance/glance-api/start.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -set -o errexit - -CMD="/usr/bin/glance-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 "glance-manage db_sync" glance - exit 0 -fi - -exec $CMD $ARGS diff --git a/docker/common/glance/glance-registry/config-external.sh b/docker/common/glance/glance-registry/config-external.sh deleted file mode 100755 index 37abd136d..000000000 --- a/docker/common/glance/glance-registry/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/glance-registry/glance-registry.conf" -TARGET="/etc/glance/glance-registry.conf" -OWNER="glance" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/glance/glance-registry/start.sh b/docker/common/glance/glance-registry/start.sh deleted file mode 100755 index 1d8265f80..000000000 --- a/docker/common/glance/glance-registry/start.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -o errexit - -CMD="/usr/bin/glance-registry" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS |