diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-25 13:50:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-25 13:50:50 +0000 |
| commit | b27564bca2d90af97e7337826473ac504da1d430 (patch) | |
| tree | f86f2e8c25fd6655886cfe9ab87d797dc9d813fb /docker | |
| parent | 6cf67a05e1ba0e155fb4a40692dd24211ee790b4 (diff) | |
| parent | 9b18d2d28bb58ba7a957b788c905f3f077cabede (diff) | |
| download | kolla-b27564bca2d90af97e7337826473ac504da1d430.tar.gz kolla-b27564bca2d90af97e7337826473ac504da1d430.zip | |
Merge "Replace config-external - memcached"
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/memcached/start.sh | 18 |
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 |