Move scripts for glance to docker_templates

Change-Id: I6272caf3939a2e13a4599239d85020205ff7d9e3
Partially-Implements: blueprint remove-docker-dir

8 files changed, 53 insertions, 57 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
diff --git a/docker_templates/glance/glance-api/config-external.sh b/docker_templates/glance/glance-api/config-external.sh
index 4261b90e1..ce5411738 120000..100755
--- a/docker_templates/glance/glance-api/config-external.sh
+++ b/docker_templates/glance/glance-api/config-external.sh
@@ -1 +1,10 @@
-../../../docker/common/glance/glance-api/config-external.sh
\ No newline at end of file
+#!/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
index 395aafe82..ce3cb6d8b 120000..100755
--- a/docker_templates/glance/glance-api/start.sh
+++ b/docker_templates/glance/glance-api/start.sh
@@ -1 +1,20 @@
-../../../docker/common/glance/glance-api/start.sh
\ No newline at end of file
+#!/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
index c652dc476..37abd136d 120000..100755
--- a/docker_templates/glance/glance-registry/config-external.sh
+++ b/docker_templates/glance/glance-registry/config-external.sh
@@ -1 +1,10 @@
-../../../docker/common/glance/glance-registry/config-external.sh
\ No newline at end of file
+#!/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
index 72d1278ab..1d8265f80 120000..100755
--- a/docker_templates/glance/glance-registry/start.sh
+++ b/docker_templates/glance/glance-registry/start.sh
@@ -1 +1,13 @@
-../../../docker/common/glance/glance-registry/start.sh
\ No newline at end of file
+#!/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