From 6e679ae8effda1992fe6d4af7e93137afbaaa1bb Mon Sep 17 00:00:00 2001
From: Qiu Yu <qiuyu@ebaysf.com>
Date: Mon, 21 Sep 2015 17:51:26 -0700
Subject: [PATCH] Fix memcached user on Debian/Ubuntu based distro

Change-Id: Ib99ca16e8633ddd630699956014d47fc72c2cd0d
Closes-Bug: #1498238
---
 docker/memcached/config-external.sh |  7 +++++++
 docker/memcached/start.sh           | 10 ++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/docker/memcached/config-external.sh b/docker/memcached/config-external.sh
index 0f3fa83361..d373ddc226 100644
--- a/docker/memcached/config-external.sh
+++ b/docker/memcached/config-external.sh
@@ -3,6 +3,13 @@ SOURCE="/opt/kolla/memcached/memcached.conf"
 TARGET="/etc/memcached.conf"
 OWNER="memcached"
 
+if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \
+        "${KOLLA_BASE_DISTRO}" == "debian" ]]; then
+    OWNER="memcache"
+else
+    OWNER="memcached"
+fi
+
 if [[ -f "$SOURCE" ]]; then
     cp $SOURCE $TARGET
     chown ${OWNER}: $TARGET
diff --git a/docker/memcached/start.sh b/docker/memcached/start.sh
index 531dd38726..b8628b9148 100755
--- a/docker/memcached/start.sh
+++ b/docker/memcached/start.sh
@@ -2,8 +2,14 @@
 
 set -o errexit
 
-CMD="/usr/bin/memcached"
-ARGS="-u memcached -vv"
+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