aboutsummaryrefslogtreecommitdiff
path: root/docker_templates
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-08-27 18:23:42 -0700
committerSteven Dake <stdake@cisco.com>2015-08-28 00:50:29 -0700
commiteb9d7da1a085e1179e0e922eebcd25c776d8196a (patch)
treec98ad1c7c82bad7e5434919ee08566989dbb1368 /docker_templates
parent4438d45a125391f5cf6cef0c6b2197433af7602b (diff)
downloadkolla-eb9d7da1a085e1179e0e922eebcd25c776d8196a.tar.gz
kolla-eb9d7da1a085e1179e0e922eebcd25c776d8196a.zip
Move scripts for memcached to docker_templates
Change-Id: I3632f7d60e5830a394cd8ac1c17941745f6f2813 Partially-Implements: blueprint remove-docker-dir
Diffstat (limited to 'docker_templates')
-rw-r--r--[l---------]docker_templates/memcached/config-external.sh11
-rwxr-xr-x[l---------]docker_templates/memcached/start.sh17
2 files changed, 26 insertions, 2 deletions
diff --git a/docker_templates/memcached/config-external.sh b/docker_templates/memcached/config-external.sh
index b6b337370..0f3fa8336 120000..100644
--- a/docker_templates/memcached/config-external.sh
+++ b/docker_templates/memcached/config-external.sh
@@ -1 +1,10 @@
-../../docker/common/memcached/config-external.sh \ No newline at end of file
+#!/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
index c696258a2..531dd3872 120000..100755
--- a/docker_templates/memcached/start.sh
+++ b/docker_templates/memcached/start.sh
@@ -1 +1,16 @@
-../../docker/common/memcached/start.sh \ No newline at end of file
+#!/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