From 9b18d2d28bb58ba7a957b788c905f3f077cabede Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Fri, 25 Sep 2015 10:16:59 +0000
Subject: Replace config-external - memcached

Change-Id: I83094d1fc98c79c74d6c9fdc68aa224ae4a6d672
Partially-Implements: blueprint replace-config-external
---
 docker/memcached/start.sh | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'docker')

diff --git a/docker/memcached/start.sh b/docker/memcached/start.sh
index b8628b914..bfa6c7878 100755
--- a/docker/memcached/start.sh
+++ b/docker/memcached/start.sh
@@ -2,21 +2,11 @@
 
 set -o errexit
 
-if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \
-        "${KOLLA_BASE_DISTRO}" == "debian" ]]; then
-    CMD="/usr/bin/memcached"
-    ARGS="-u memcache -vv"
-else
-    CMD="/usr/bin/memcached"
-    ARGS="-u memcached -vv"
-fi
-
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Execute config strategy
-set_configs
-
-source /etc/memcached.conf
+# Generate run command
+python /opt/kolla/set_configs.py
+CMD=$(cat /run_command)
 
-exec $CMD $ARGS $OPTIONS
+exec $CMD
-- 
cgit v1.2.3