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: [PATCH] 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
---
 ansible/group_vars/all.yml         | 4 ++--
 docker/common/base/kolla-common.sh | 8 ++------
 etc/kolla/globals.yml              | 4 ++--
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 1b19ebb271..16efa3d5cc 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -17,8 +17,8 @@ node_config_directory: "/etc/kolla"
 ###################
 # Kolla options
 ###################
-# Valid options are [ CONFIG_EXTERNAL_COPY_ONCE, CONFIG_EXTERNAL_COPY_ALWAYS ]
-config_strategy: "CONFIG_EXTERNAL_COPY_ONCE"
+# Valid options are [ COPY_ONCE, COPY_ALWAYS ]
+config_strategy: "COPY_ONCE"
 
 # Valid options are [ centos, fedora, oraclelinux, ubuntu ]
 kolla_base_distro: "centos"
diff --git a/docker/common/base/kolla-common.sh b/docker/common/base/kolla-common.sh
index 38b1f23ec9..cc960ca24f 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
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 47467f3b26..926ae84eb9 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -5,8 +5,8 @@
 ###################
 # Kolla options
 ###################
-# Valid options are [ CONFIG_EXTERNAL_COPY_ONCE, CONFIG_EXTERNAL_COPY_ALWAYS ]
-#config_strategy: "CONFIG_EXTERNAL_COPY_ONCE"
+# Valid options are [ COPY_ONCE, COPY_ALWAYS ]
+#config_strategy: "COPY_ONCE"
 
 # Valid options are [ centos, fedora, oraclelinux, ubuntu ]
 #kolla_base_distro: "centos"