From d13163ab5165a314ea956c841155616fa305ee62 Mon Sep 17 00:00:00 2001 From: Paul Bourke Date: Fri, 14 Aug 2015 13:26:04 +0000 Subject: Add Ansible role for memcached Note, this is not in the inventories/site.yml as it will be a transparent dependency of Swift. Change-Id: Ic8c80072596594e646ece74ac0ce74c7000398ff Partitially-Implements: blueprint ansible-swift --- docker/common/memcached/config-external.sh | 6 +++--- docker/common/memcached/start.sh | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'docker') 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 -- cgit v1.2.3