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