diff options
| author | Qiu Yu <qiuyu@ebaysf.com> | 2015-09-21 17:51:26 -0700 |
|---|---|---|
| committer | Qiu Yu <qiuyu@ebaysf.com> | 2015-09-22 08:54:39 +0800 |
| commit | 6e679ae8effda1992fe6d4af7e93137afbaaa1bb (patch) | |
| tree | 91dd9fb55decdf7194eff3e4b50083d6b464c199 /docker | |
| parent | 66608efd11c76cbcaca2f7d6775ea5db24ec2cc1 (diff) | |
| download | kolla-6e679ae8effda1992fe6d4af7e93137afbaaa1bb.tar.gz kolla-6e679ae8effda1992fe6d4af7e93137afbaaa1bb.zip | |
Fix memcached user on Debian/Ubuntu based distro
Change-Id: Ib99ca16e8633ddd630699956014d47fc72c2cd0d
Closes-Bug: #1498238
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/memcached/config-external.sh | 7 | ||||
| -rwxr-xr-x | 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 0f3fa8336..d373ddc22 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 531dd3872..b8628b914 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 |