diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-27 18:23:42 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-28 00:50:29 -0700 |
| commit | eb9d7da1a085e1179e0e922eebcd25c776d8196a (patch) | |
| tree | c98ad1c7c82bad7e5434919ee08566989dbb1368 | |
| parent | 4438d45a125391f5cf6cef0c6b2197433af7602b (diff) | |
| download | kolla-eb9d7da1a085e1179e0e922eebcd25c776d8196a.tar.gz kolla-eb9d7da1a085e1179e0e922eebcd25c776d8196a.zip | |
Move scripts for memcached to docker_templates
Change-Id: I3632f7d60e5830a394cd8ac1c17941745f6f2813
Partially-Implements: blueprint remove-docker-dir
| -rw-r--r-- | docker/common/memcached/config-external.sh | 10 | ||||
| -rwxr-xr-x | docker/common/memcached/start.sh | 16 | ||||
| -rw-r--r--[l---------] | docker_templates/memcached/config-external.sh | 11 | ||||
| -rwxr-xr-x[l---------] | docker_templates/memcached/start.sh | 17 |
4 files changed, 26 insertions, 28 deletions
diff --git a/docker/common/memcached/config-external.sh b/docker/common/memcached/config-external.sh deleted file mode 100644 index 0f3fa8336..000000000 --- a/docker/common/memcached/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/memcached/memcached.conf" -TARGET="/etc/memcached.conf" -OWNER="memcached" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/memcached/start.sh b/docker/common/memcached/start.sh deleted file mode 100755 index 531dd3872..000000000 --- a/docker/common/memcached/start.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -set -o errexit - -CMD="/usr/bin/memcached" -ARGS="-u memcached -vv" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -source /etc/memcached.conf - -exec $CMD $ARGS $OPTIONS diff --git a/docker_templates/memcached/config-external.sh b/docker_templates/memcached/config-external.sh index b6b337370..0f3fa8336 120000..100644 --- a/docker_templates/memcached/config-external.sh +++ b/docker_templates/memcached/config-external.sh @@ -1 +1,10 @@ -../../docker/common/memcached/config-external.sh
\ No newline at end of file +#!/bin/bash +SOURCE="/opt/kolla/memcached/memcached.conf" +TARGET="/etc/memcached.conf" +OWNER="memcached" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker_templates/memcached/start.sh b/docker_templates/memcached/start.sh index c696258a2..531dd3872 120000..100755 --- a/docker_templates/memcached/start.sh +++ b/docker_templates/memcached/start.sh @@ -1 +1,16 @@ -../../docker/common/memcached/start.sh
\ No newline at end of file +#!/bin/bash + +set -o errexit + +CMD="/usr/bin/memcached" +ARGS="-u memcached -vv" + +# Loading common functions. +source /opt/kolla/kolla-common.sh + +# Execute config strategy +set_configs + +source /etc/memcached.conf + +exec $CMD $ARGS $OPTIONS |