diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-24 14:01:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-24 14:01:44 +0000 |
| commit | 9c54b0afff2c522960d6a13eb4885cb2a0a53ce0 (patch) | |
| tree | cc34c2c853bff61626afa67bd52349c8d0952b62 | |
| parent | 603bbae0f49f1e05156cae1a377b561938cef233 (diff) | |
| parent | 6e679ae8effda1992fe6d4af7e93137afbaaa1bb (diff) | |
| download | kolla-9c54b0afff2c522960d6a13eb4885cb2a0a53ce0.tar.gz kolla-9c54b0afff2c522960d6a13eb4885cb2a0a53ce0.zip | |
Merge "Fix memcached user on Debian/Ubuntu based distro"
| -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 |