aboutsummaryrefslogtreecommitdiff
path: root/docker/memcached
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-09-25 10:16:59 +0000
committerSam Yaple <sam@yaple.net>2015-09-25 11:06:38 +0000
commit9b18d2d28bb58ba7a957b788c905f3f077cabede (patch)
tree84d7863fd7604e76cdfbd24862bb132144b9803a /docker/memcached
parent4d5186473ec0ed8b350052049f38f969644f36d5 (diff)
downloadkolla-9b18d2d28bb58ba7a957b788c905f3f077cabede.tar.gz
kolla-9b18d2d28bb58ba7a957b788c905f3f077cabede.zip
Replace config-external - memcached
Change-Id: I83094d1fc98c79c74d6c9fdc68aa224ae4a6d672 Partially-Implements: blueprint replace-config-external
Diffstat (limited to 'docker/memcached')
-rwxr-xr-xdocker/memcached/start.sh18
1 files changed, 4 insertions, 14 deletions
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