openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix memcached user on Debian/Ubuntu based distro"

Browse Source
This commit is contained in:
Jenkins 2015-09-24 14:01:44 +00:00 committed by Gerrit Code Review
commit 9c54b0afff
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/memcached/config-external.sh
View File

@ -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

10
docker/memcached/start.sh
View File

@ -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