From 9f5edb4afc3061fc44fd1a9b66207f29d879ab97 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Thu, 27 Aug 2015 13:06:35 +0000
Subject: Remove CONFIG_STRATEGY prefix

We no longer have CONFIG_INTERNAL and moving forward CONFIG_STRATEGY
infront of COPY_ALWAYS or COPY_ONCE will just lead to confusion.

Change-Id: Ie0d71637e25cbd79d46e1cdca62df714c10b85d2
Implements: blueprint update-configs
---
 docker/common/base/kolla-common.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'docker')

diff --git a/docker/common/base/kolla-common.sh b/docker/common/base/kolla-common.sh
index 38b1f23ec..cc960ca24 100644
--- a/docker/common/base/kolla-common.sh
+++ b/docker/common/base/kolla-common.sh
@@ -2,14 +2,10 @@
 
 set_configs() {
     case $KOLLA_CONFIG_STRATEGY in
-        CONFIG_INTERNAL)
-            echo "Config internal no longer exists in this project."
-            exit 1
-            ;;
-        CONFIG_EXTERNAL_COPY_ALWAYS)
+        COPY_ALWAYS)
             source /opt/kolla/config-external.sh
             ;;
-        CONFIG_EXTERNAL_COPY_ONCE)
+        COPY_ONCE)
             if [[ -f /configured ]]; then
                 echo 'INFO - This container has already been configured; Refusing to copy new configs'
             else
-- 
cgit v1.2.3