From 19318667ba1175c684961e044f1c798f6f9768a6 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Thu, 27 Aug 2015 17:59:18 -0700 Subject: [PATCH] Move scripts for glance to docker_templates Change-Id: I6272caf3939a2e13a4599239d85020205ff7d9e3 Partially-Implements: blueprint remove-docker-dir --- .../glance/glance-api/config-external.sh | 10 --------- docker/common/glance/glance-api/start.sh | 20 ------------------ .../glance/glance-registry/config-external.sh | 10 --------- docker/common/glance/glance-registry/start.sh | 13 ------------ .../glance/glance-api/config-external.sh | 11 +++++++++- docker_templates/glance/glance-api/start.sh | 21 ++++++++++++++++++- .../glance/glance-registry/config-external.sh | 11 +++++++++- .../glance/glance-registry/start.sh | 14 ++++++++++++- 8 files changed, 53 insertions(+), 57 deletions(-) delete mode 100755 docker/common/glance/glance-api/config-external.sh delete mode 100755 docker/common/glance/glance-api/start.sh delete mode 100755 docker/common/glance/glance-registry/config-external.sh delete mode 100755 docker/common/glance/glance-registry/start.sh mode change 120000 => 100755 docker_templates/glance/glance-api/config-external.sh mode change 120000 => 100755 docker_templates/glance/glance-api/start.sh mode change 120000 => 100755 docker_templates/glance/glance-registry/config-external.sh mode change 120000 => 100755 docker_templates/glance/glance-registry/start.sh 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 ce54117381..0000000000 --- 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 ce3cb6d8bb..0000000000 --- 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 37abd136da..0000000000 --- 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 1d8265f80a..0000000000 --- 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 diff --git a/docker_templates/glance/glance-api/config-external.sh b/docker_templates/glance/glance-api/config-external.sh deleted file mode 120000 index 4261b90e19..0000000000 --- a/docker_templates/glance/glance-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../docker/common/glance/glance-api/config-external.sh \ No newline at end of file diff --git a/docker_templates/glance/glance-api/config-external.sh b/docker_templates/glance/glance-api/config-external.sh new file mode 100755 index 0000000000..ce54117381 --- /dev/null +++ b/docker_templates/glance/glance-api/config-external.sh @@ -0,0 +1,10 @@ +#!/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_templates/glance/glance-api/start.sh b/docker_templates/glance/glance-api/start.sh deleted file mode 120000 index 395aafe82e..0000000000 --- a/docker_templates/glance/glance-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../docker/common/glance/glance-api/start.sh \ No newline at end of file diff --git a/docker_templates/glance/glance-api/start.sh b/docker_templates/glance/glance-api/start.sh new file mode 100755 index 0000000000..ce3cb6d8bb --- /dev/null +++ b/docker_templates/glance/glance-api/start.sh @@ -0,0 +1,20 @@ +#!/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_templates/glance/glance-registry/config-external.sh b/docker_templates/glance/glance-registry/config-external.sh deleted file mode 120000 index c652dc476c..0000000000 --- a/docker_templates/glance/glance-registry/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../docker/common/glance/glance-registry/config-external.sh \ No newline at end of file diff --git a/docker_templates/glance/glance-registry/config-external.sh b/docker_templates/glance/glance-registry/config-external.sh new file mode 100755 index 0000000000..37abd136da --- /dev/null +++ b/docker_templates/glance/glance-registry/config-external.sh @@ -0,0 +1,10 @@ +#!/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_templates/glance/glance-registry/start.sh b/docker_templates/glance/glance-registry/start.sh deleted file mode 120000 index 72d1278abc..0000000000 --- a/docker_templates/glance/glance-registry/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../docker/common/glance/glance-registry/start.sh \ No newline at end of file diff --git a/docker_templates/glance/glance-registry/start.sh b/docker_templates/glance/glance-registry/start.sh new file mode 100755 index 0000000000..1d8265f80a --- /dev/null +++ b/docker_templates/glance/glance-registry/start.sh @@ -0,0 +1,13 @@ +#!/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