Merge "Remove CONFIG_STRATEGY prefix"

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"

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

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"