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: Remove config-internal for memcached

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

(limited to 'docker/common')

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 f27cf1a83..000000000
--- 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 5348a3b5e..2d69b41b7 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
-- 
cgit v1.2.3