From eb9d7da1a085e1179e0e922eebcd25c776d8196a Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Thu, 27 Aug 2015 18:23:42 -0700
Subject: Move scripts for memcached to docker_templates

Change-Id: I3632f7d60e5830a394cd8ac1c17941745f6f2813
Partially-Implements: blueprint remove-docker-dir
---
 docker/common/memcached/config-external.sh    | 10 ----------
 docker/common/memcached/start.sh              | 16 ----------------
 docker_templates/memcached/config-external.sh | 11 ++++++++++-
 docker_templates/memcached/start.sh           | 17 ++++++++++++++++-
 4 files changed, 26 insertions(+), 28 deletions(-)
 delete mode 100644 docker/common/memcached/config-external.sh
 delete mode 100755 docker/common/memcached/start.sh
 mode change 120000 => 100644 docker_templates/memcached/config-external.sh
 mode change 120000 => 100755 docker_templates/memcached/start.sh

diff --git a/docker/common/memcached/config-external.sh b/docker/common/memcached/config-external.sh
deleted file mode 100644
index 0f3fa8336..000000000
--- a/docker/common/memcached/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/memcached/memcached.conf"
-TARGET="/etc/memcached.conf"
-OWNER="memcached"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker/common/memcached/start.sh b/docker/common/memcached/start.sh
deleted file mode 100755
index 531dd3872..000000000
--- a/docker/common/memcached/start.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-CMD="/usr/bin/memcached"
-ARGS="-u memcached -vv"
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-source /etc/memcached.conf
-
-exec $CMD $ARGS $OPTIONS
diff --git a/docker_templates/memcached/config-external.sh b/docker_templates/memcached/config-external.sh
deleted file mode 120000
index b6b337370..000000000
--- a/docker_templates/memcached/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../docker/common/memcached/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/memcached/config-external.sh b/docker_templates/memcached/config-external.sh
new file mode 100644
index 000000000..0f3fa8336
--- /dev/null
+++ b/docker_templates/memcached/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/memcached/memcached.conf"
+TARGET="/etc/memcached.conf"
+OWNER="memcached"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker_templates/memcached/start.sh b/docker_templates/memcached/start.sh
deleted file mode 120000
index c696258a2..000000000
--- a/docker_templates/memcached/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../docker/common/memcached/start.sh
\ No newline at end of file
diff --git a/docker_templates/memcached/start.sh b/docker_templates/memcached/start.sh
new file mode 100755
index 000000000..531dd3872
--- /dev/null
+++ b/docker_templates/memcached/start.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -o errexit
+
+CMD="/usr/bin/memcached"
+ARGS="-u memcached -vv"
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+source /etc/memcached.conf
+
+exec $CMD $ARGS $OPTIONS
-- 
cgit v1.2.3