openstack/kolla-ansible
Code Issues Proposed changes

Remove config-internal for memcached

Browse Source 
Change-Id: I801608a303b7376c5f386db684e9be7ada5af3d3
Partially-implements: blueprint remove-config-internal
This commit is contained in:
Sam Yaple 2015-08-07 18:23:51 +00:00
parent a5e907a8e9
commit a7223799c9
5 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/centos/binary/memcached/Dockerfile
View File

@ -4,7 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install memcached && yum clean all RUN yum -y install memcached && yum clean all
COPY start.sh / COPY start.sh /
COPY config-external.sh /opt/kolla/
COPY config-internal.sh config-external.sh /opt/kolla/
CMD ["/start.sh"] CMD ["/start.sh"]

1
docker/centos/binary/memcached/config-internal.sh
View File

@ -1 +0,0 @@
../../../../docker/common/memcached/config-internal.sh

0
docker/common/memcached/config-external.sh Executable file → Normal file
View File

8
docker/common/memcached/config-internal.sh
View File

@ -1,8 +0,0 @@
#!/bin/bash
set -o errexit
CMD="/usr/bin/memcached"
ARGS="-u memcached -vv"
exec $CMD $ARGS

2
docker/common/memcached/start.sh
View File

@ -8,7 +8,7 @@ ARGS="-u memcached -vv"
# Loading common functions. # Loading common functions.
source /opt/kolla/kolla-common.sh source /opt/kolla/kolla-common.sh
# Config-internal script exec out of this function, it does not return here. # Execute config strategy
set_configs set_configs
exec $CMD $ARGS exec $CMD $ARGS