diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-22 01:42:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-22 01:42:47 +0000 |
| commit | f70e8d4598c58f8b2904542f7e0d87c693f70761 (patch) | |
| tree | 14bfd77077a9ca1ace6172aa1775de47fa888080 /docker | |
| parent | f14b229b1023c8808f07cdeedf875961bb923b0c (diff) | |
| parent | d13163ab5165a314ea956c841155616fa305ee62 (diff) | |
| download | kolla-f70e8d4598c58f8b2904542f7e0d87c693f70761.tar.gz kolla-f70e8d4598c58f8b2904542f7e0d87c693f70761.zip | |
Merge "Add Ansible role for memcached"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/common/memcached/config-external.sh | 6 | ||||
| -rwxr-xr-x | docker/common/memcached/start.sh | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/docker/common/memcached/config-external.sh b/docker/common/memcached/config-external.sh index ab9593896..0f3fa8336 100644 --- a/docker/common/memcached/config-external.sh +++ b/docker/common/memcached/config-external.sh @@ -1,7 +1,7 @@ #!/bin/bash -SOURCE="/opt/kolla/memcached/memcached" -TARGET="/etc/sysconfig/memcached" -OWNER="swift" +SOURCE="/opt/kolla/memcached/memcached.conf" +TARGET="/etc/memcached.conf" +OWNER="memcached" if [[ -f "$SOURCE" ]]; then cp $SOURCE $TARGET diff --git a/docker/common/memcached/start.sh b/docker/common/memcached/start.sh index 2d69b41b7..531dd3872 100755 --- a/docker/common/memcached/start.sh +++ b/docker/common/memcached/start.sh @@ -11,4 +11,6 @@ source /opt/kolla/kolla-common.sh # Execute config strategy set_configs -exec $CMD $ARGS +source /etc/memcached.conf + +exec $CMD $ARGS $OPTIONS |