diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-23 09:38:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-23 09:38:54 +0000 |
| commit | b9a1b7617582baf297780cc190873b7cf69a5629 (patch) | |
| tree | f74350951aeafc82f408e8b23abafeedafa0c088 /docker/common | |
| parent | 6d4a55060e13723138facd90dc9786e7f2c3684b (diff) | |
| parent | ffad0a13a0cc5fa638c960c075be034c2929ba18 (diff) | |
| download | kolla-b9a1b7617582baf297780cc190873b7cf69a5629.tar.gz kolla-b9a1b7617582baf297780cc190873b7cf69a5629.zip | |
Merge "Add memcached image (required by Swift)"
Diffstat (limited to 'docker/common')
| -rwxr-xr-x | docker/common/memcached/config-external.sh | 10 | ||||
| -rwxr-xr-x | docker/common/memcached/config-internal.sh | 8 | ||||
| -rwxr-xr-x | docker/common/memcached/start.sh | 14 |
3 files changed, 32 insertions, 0 deletions
diff --git a/docker/common/memcached/config-external.sh b/docker/common/memcached/config-external.sh new file mode 100755 index 000000000..ab9593896 --- /dev/null +++ b/docker/common/memcached/config-external.sh @@ -0,0 +1,10 @@ +#!/bin/bash +SOURCE="/opt/kolla/memcached/memcached" +TARGET="/etc/sysconfig/memcached" +OWNER="swift" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker/common/memcached/config-internal.sh b/docker/common/memcached/config-internal.sh new file mode 100755 index 000000000..f27cf1a83 --- /dev/null +++ b/docker/common/memcached/config-internal.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +set -o errexit + +CMD="/usr/bin/memcached" +ARGS="-u memcached -vv" + +exec $CMD $ARGS diff --git a/docker/common/memcached/start.sh b/docker/common/memcached/start.sh new file mode 100755 index 000000000..5348a3b5e --- /dev/null +++ b/docker/common/memcached/start.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +set -o errexit + +CMD="/usr/bin/memcached" +ARGS="-u memcached -vv" + +# Loading common functions. +source /opt/kolla/kolla-common.sh + +# Config-internal script exec out of this function, it does not return here. +set_configs + +exec $CMD $ARGS |
