Move scripts for designate to docker_templates

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

24 files changed, 145 insertions, 157 deletions

diff --git a/docker/common/designate/designate-api/config-external.sh b/docker/common/designate/designate-api/config-external.sh
deleted file mode 100644
index ce302ea0c..000000000
--- a/docker/common/designate/designate-api/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
-TARGET="/etc/designate/designate.conf"
-OWNER="designate"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/designate/designate-api/start.sh b/docker/common/designate/designate-api/start.sh
deleted file mode 100755
index fe556225b..000000000
--- a/docker/common/designate/designate-api/start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-CMD="/usr/bin/designate-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 "designate-manage db_sync" designate
-    exit 0
-fi
-
-exec $CMD $ARGS
diff --git a/docker/common/designate/designate-backend-bind9/config-external.sh b/docker/common/designate/designate-backend-bind9/config-external.sh
deleted file mode 100644
index ce302ea0c..000000000
--- a/docker/common/designate/designate-backend-bind9/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
-TARGET="/etc/designate/designate.conf"
-OWNER="designate"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/designate/designate-backend-bind9/start.sh b/docker/common/designate/designate-backend-bind9/start.sh
deleted file mode 100755
index 11922974a..000000000
--- a/docker/common/designate/designate-backend-bind9/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-CMD="/usr/sbin/named"
-ARGS="-u named -g"
-
-# Execute config strategy
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker/common/designate/designate-central/config-external.sh b/docker/common/designate/designate-central/config-external.sh
deleted file mode 100644
index ce302ea0c..000000000
--- a/docker/common/designate/designate-central/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
-TARGET="/etc/designate/designate.conf"
-OWNER="designate"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/designate/designate-central/start.sh b/docker/common/designate/designate-central/start.sh
deleted file mode 100755
index eac012d3d..000000000
--- a/docker/common/designate/designate-central/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-CMD="/usr/bin/designate-central"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker/common/designate/designate-mdns/config-external.sh b/docker/common/designate/designate-mdns/config-external.sh
deleted file mode 100644
index ce302ea0c..000000000
--- a/docker/common/designate/designate-mdns/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
-TARGET="/etc/designate/designate.conf"
-OWNER="designate"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/designate/designate-mdns/start.sh b/docker/common/designate/designate-mdns/start.sh
deleted file mode 100755
index b4bcda20c..000000000
--- a/docker/common/designate/designate-mdns/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-CMD="/usr/bin/designate-mdns"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker/common/designate/designate-poolmanager/config-external.sh b/docker/common/designate/designate-poolmanager/config-external.sh
deleted file mode 100644
index ce302ea0c..000000000
--- a/docker/common/designate/designate-poolmanager/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
-TARGET="/etc/designate/designate.conf"
-OWNER="designate"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/designate/designate-poolmanager/start.sh b/docker/common/designate/designate-poolmanager/start.sh
deleted file mode 100755
index 0752b9847..000000000
--- a/docker/common/designate/designate-poolmanager/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-CMD="/usr/bin/designate-pool-manager"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker/common/designate/designate-sink/config-external.sh b/docker/common/designate/designate-sink/config-external.sh
deleted file mode 100644
index ce302ea0c..000000000
--- a/docker/common/designate/designate-sink/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/designate/designate.conf"
-TARGET="/etc/designate/designate.conf"
-OWNER="designate"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/designate/designate-sink/start.sh b/docker/common/designate/designate-sink/start.sh
deleted file mode 100755
index d2f93e26f..000000000
--- a/docker/common/designate/designate-sink/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-CMD="/usr/bin/designate-sink"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker_templates/designate/designate-api/config-external.sh b/docker_templates/designate/designate-api/config-external.sh
index 1dbb444c7..ce302ea0c 120000..100644
--- a/docker_templates/designate/designate-api/config-external.sh
+++ b/docker_templates/designate/designate-api/config-external.sh
@@ -1 +1,10 @@
-../../../docker/common/designate/designate-api/config-external.sh
\ No newline at end of file
+#!/bin/bash
+SOURCE="/opt/kolla/designate/designate.conf"
+TARGET="/etc/designate/designate.conf"
+OWNER="designate"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/designate/designate-api/start.sh b/docker_templates/designate/designate-api/start.sh
index b21633146..fe556225b 120000..100755
--- a/docker_templates/designate/designate-api/start.sh
+++ b/docker_templates/designate/designate-api/start.sh
@@ -1 +1,20 @@
-../../../docker/common/designate/designate-api/start.sh
\ No newline at end of file
+#!/bin/bash
+
+set -o errexit
+CMD="/usr/bin/designate-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 "designate-manage db_sync" designate
+    exit 0
+fi
+
+exec $CMD $ARGS
diff --git a/docker_templates/designate/designate-backend-bind9/config-external.sh b/docker_templates/designate/designate-backend-bind9/config-external.sh
index a6b9418b7..ce302ea0c 120000..100644
--- a/docker_templates/designate/designate-backend-bind9/config-external.sh
+++ b/docker_templates/designate/designate-backend-bind9/config-external.sh
@@ -1 +1,10 @@
-../../../docker/common/designate/designate-backend-bind9/config-external.sh
\ No newline at end of file
+#!/bin/bash
+SOURCE="/opt/kolla/designate/designate.conf"
+TARGET="/etc/designate/designate.conf"
+OWNER="designate"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/designate/designate-backend-bind9/start.sh b/docker_templates/designate/designate-backend-bind9/start.sh
index df9938517..11922974a 120000..100755
--- a/docker_templates/designate/designate-backend-bind9/start.sh
+++ b/docker_templates/designate/designate-backend-bind9/start.sh
@@ -1 +1,13 @@
-../../../docker/common/designate/designate-backend-bind9/start.sh
\ No newline at end of file
+#!/bin/bash
+
+set -o errexit
+CMD="/usr/sbin/named"
+ARGS="-u named -g"
+
+# Execute config strategy
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
diff --git a/docker_templates/designate/designate-central/config-external.sh b/docker_templates/designate/designate-central/config-external.sh
index ec5f415df..ce302ea0c 120000..100644
--- a/docker_templates/designate/designate-central/config-external.sh
+++ b/docker_templates/designate/designate-central/config-external.sh
@@ -1 +1,10 @@
-../../../docker/common/designate/designate-central/config-external.sh
\ No newline at end of file
+#!/bin/bash
+SOURCE="/opt/kolla/designate/designate.conf"
+TARGET="/etc/designate/designate.conf"
+OWNER="designate"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/designate/designate-central/start.sh b/docker_templates/designate/designate-central/start.sh
index 5198d9887..eac012d3d 120000..100755
--- a/docker_templates/designate/designate-central/start.sh
+++ b/docker_templates/designate/designate-central/start.sh
@@ -1 +1,13 @@
-../../../docker/common/designate/designate-central/start.sh
\ No newline at end of file
+#!/bin/bash
+
+set -o errexit
+CMD="/usr/bin/designate-central"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
diff --git a/docker_templates/designate/designate-mdns/config-external.sh b/docker_templates/designate/designate-mdns/config-external.sh
index c7be89748..ce302ea0c 120000..100644
--- a/docker_templates/designate/designate-mdns/config-external.sh
+++ b/docker_templates/designate/designate-mdns/config-external.sh
@@ -1 +1,10 @@
-../../../docker/common/designate/designate-mdns/config-external.sh
\ No newline at end of file
+#!/bin/bash
+SOURCE="/opt/kolla/designate/designate.conf"
+TARGET="/etc/designate/designate.conf"
+OWNER="designate"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/designate/designate-mdns/start.sh b/docker_templates/designate/designate-mdns/start.sh
index 26da1f200..b4bcda20c 120000..100755
--- a/docker_templates/designate/designate-mdns/start.sh
+++ b/docker_templates/designate/designate-mdns/start.sh
@@ -1 +1,13 @@
-../../../docker/common/designate/designate-mdns/start.sh
\ No newline at end of file
+#!/bin/bash
+
+set -o errexit
+CMD="/usr/bin/designate-mdns"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
diff --git a/docker_templates/designate/designate-poolmanager/config-external.sh b/docker_templates/designate/designate-poolmanager/config-external.sh
index 29989479e..ce302ea0c 120000..100644
--- a/docker_templates/designate/designate-poolmanager/config-external.sh
+++ b/docker_templates/designate/designate-poolmanager/config-external.sh
@@ -1 +1,10 @@
-../../../docker/common/designate/designate-poolmanager/config-external.sh
\ No newline at end of file
+#!/bin/bash
+SOURCE="/opt/kolla/designate/designate.conf"
+TARGET="/etc/designate/designate.conf"
+OWNER="designate"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/designate/designate-poolmanager/start.sh b/docker_templates/designate/designate-poolmanager/start.sh
index bd7ab705b..0752b9847 120000..100755
--- a/docker_templates/designate/designate-poolmanager/start.sh
+++ b/docker_templates/designate/designate-poolmanager/start.sh
@@ -1 +1,13 @@
-../../../docker/common/designate/designate-poolmanager/start.sh
\ No newline at end of file
+#!/bin/bash
+
+set -o errexit
+CMD="/usr/bin/designate-pool-manager"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
diff --git a/docker_templates/designate/designate-sink/config-external.sh b/docker_templates/designate/designate-sink/config-external.sh
index a3a21f343..ce302ea0c 120000..100644
--- a/docker_templates/designate/designate-sink/config-external.sh
+++ b/docker_templates/designate/designate-sink/config-external.sh
@@ -1 +1,10 @@
-../../../docker/common/designate/designate-sink/config-external.sh
\ No newline at end of file
+#!/bin/bash
+SOURCE="/opt/kolla/designate/designate.conf"
+TARGET="/etc/designate/designate.conf"
+OWNER="designate"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/designate/designate-sink/start.sh b/docker_templates/designate/designate-sink/start.sh
index 64853dd18..d2f93e26f 120000..100755
--- a/docker_templates/designate/designate-sink/start.sh
+++ b/docker_templates/designate/designate-sink/start.sh
@@ -1 +1,13 @@
-../../../docker/common/designate/designate-sink/start.sh
\ No newline at end of file
+#!/bin/bash
+
+set -o errexit
+CMD="/usr/bin/designate-sink"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS