From a7223799c98921e886f0ac267975f46ec9a2b759 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Fri, 7 Aug 2015 18:23:51 +0000
Subject: [PATCH] Remove config-internal for memcached

Change-Id: I801608a303b7376c5f386db684e9be7ada5af3d3
Partially-implements: blueprint remove-config-internal
---
 docker/centos/binary/memcached/Dockerfile         | 3 +--
 docker/centos/binary/memcached/config-internal.sh | 1 -
 docker/common/memcached/config-external.sh        | 0
 docker/common/memcached/config-internal.sh        | 8 --------
 docker/common/memcached/start.sh                  | 2 +-
 5 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 120000 docker/centos/binary/memcached/config-internal.sh
 mode change 100755 => 100644 docker/common/memcached/config-external.sh
 delete mode 100755 docker/common/memcached/config-internal.sh

diff --git a/docker/centos/binary/memcached/Dockerfile b/docker/centos/binary/memcached/Dockerfile
index 019eb4312e..0e9cf86b38 100644
--- a/docker/centos/binary/memcached/Dockerfile
+++ b/docker/centos/binary/memcached/Dockerfile
@@ -4,7 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 RUN yum -y install memcached && yum clean all
 
 COPY start.sh /
-
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/memcached/config-internal.sh b/docker/centos/binary/memcached/config-internal.sh
deleted file mode 120000
index 7ae7016a6e..0000000000
--- a/docker/centos/binary/memcached/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../docker/common/memcached/config-internal.sh
\ No newline at end of file
diff --git a/docker/common/memcached/config-external.sh b/docker/common/memcached/config-external.sh
old mode 100755
new mode 100644
diff --git a/docker/common/memcached/config-internal.sh b/docker/common/memcached/config-internal.sh
deleted file mode 100755
index f27cf1a830..0000000000
--- a/docker/common/memcached/config-internal.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
index 5348a3b5e7..2d69b41b7a 100755
--- a/docker/common/memcached/start.sh
+++ b/docker/common/memcached/start.sh
@@ -8,7 +8,7 @@ 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.
+# Execute config strategy
 set_configs
 
 exec $CMD $ARGS