diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-27 19:09:28 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-28 00:50:30 -0700 |
| commit | 5c82e0c90ce0fedf523b11b0b933f2276edf8f46 (patch) | |
| tree | 45af04ffcaa9e0d7f79b1548bfbef52839f62268 | |
| parent | 26d0d8d2fbb5f52d0b5a35e0627fb0a61f529852 (diff) | |
| download | kolla-5c82e0c90ce0fedf523b11b0b933f2276edf8f46.tar.gz kolla-5c82e0c90ce0fedf523b11b0b933f2276edf8f46.zip | |
Move scripts for zaqar to docker_templates
Change-Id: I558b4f1d8eceb420a3bf77297bd699f277f840b1
Partially-Implements: blueprint remove-docker-dir
| -rw-r--r-- | docker/common/zaqar/config-external.sh | 10 | ||||
| -rwxr-xr-x | docker/common/zaqar/start.sh | 21 | ||||
| -rw-r--r--[l---------] | docker_templates/zaqar/config-external.sh | 11 | ||||
| -rwxr-xr-x[l---------] | docker_templates/zaqar/start.sh | 22 |
4 files changed, 31 insertions, 33 deletions
diff --git a/docker/common/zaqar/config-external.sh b/docker/common/zaqar/config-external.sh deleted file mode 100644 index 7ed6da2eb..000000000 --- a/docker/common/zaqar/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/zaqar/zaqar.conf" -TARGET="/etc/zaqar/zaqar.conf" -OWNER="zaqar" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/zaqar/start.sh b/docker/common/zaqar/start.sh deleted file mode 100755 index fa1050280..000000000 --- a/docker/common/zaqar/start.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -set -o errexit - -CMD="/usr/bin/zaqar-server" -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 "zaqar-manage db_sync" cinder - exit 0 -fi - -exec $CMD $ARGS diff --git a/docker_templates/zaqar/config-external.sh b/docker_templates/zaqar/config-external.sh index 412266e05..7ed6da2eb 120000..100644 --- a/docker_templates/zaqar/config-external.sh +++ b/docker_templates/zaqar/config-external.sh @@ -1 +1,10 @@ -../../docker/common/zaqar/config-external.sh
\ No newline at end of file +#!/bin/bash +SOURCE="/opt/kolla/zaqar/zaqar.conf" +TARGET="/etc/zaqar/zaqar.conf" +OWNER="zaqar" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker_templates/zaqar/start.sh b/docker_templates/zaqar/start.sh index 51966e271..fa1050280 120000..100755 --- a/docker_templates/zaqar/start.sh +++ b/docker_templates/zaqar/start.sh @@ -1 +1,21 @@ -../../docker/common/zaqar/start.sh
\ No newline at end of file +#!/bin/bash + +set -o errexit + +CMD="/usr/bin/zaqar-server" +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 "zaqar-manage db_sync" cinder + exit 0 +fi + +exec $CMD $ARGS |