openstack/kolla-ansible
Code Issues Proposed changes

Remove CONFIG_STRATEGY prefix

Browse Source 
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
This commit is contained in:
Sam Yaple 2015-08-27 13:06:35 +00:00
parent aada29b4db
commit 9f5edb4afc
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/group_vars/all.yml
View File

@ -17,8 +17,8 @@ node_config_directory: "/etc/kolla"
################### ###################
# Kolla options # Kolla options
################### ###################
# Valid options are [ CONFIG_EXTERNAL_COPY_ONCE, CONFIG_EXTERNAL_COPY_ALWAYS ] # Valid options are [ COPY_ONCE, COPY_ALWAYS ]
config_strategy: "CONFIG_EXTERNAL_COPY_ONCE" config_strategy: "COPY_ONCE"
# Valid options are [ centos, fedora, oraclelinux, ubuntu ] # Valid options are [ centos, fedora, oraclelinux, ubuntu ]
kolla_base_distro: "centos" kolla_base_distro: "centos"

8
docker/common/base/kolla-common.sh
View File

@ -2,14 +2,10 @@
set_configs() { set_configs() {
case $KOLLA_CONFIG_STRATEGY in case $KOLLA_CONFIG_STRATEGY in
CONFIG_INTERNAL) COPY_ALWAYS)
echo "Config internal no longer exists in this project."
exit 1
;;
CONFIG_EXTERNAL_COPY_ALWAYS)
source /opt/kolla/config-external.sh source /opt/kolla/config-external.sh
;; ;;
CONFIG_EXTERNAL_COPY_ONCE) COPY_ONCE)
if [[ -f /configured ]]; then if [[ -f /configured ]]; then
echo 'INFO - This container has already been configured; Refusing to copy new configs' echo 'INFO - This container has already been configured; Refusing to copy new configs'
else else

4
etc/kolla/globals.yml
View File

@ -5,8 +5,8 @@
################### ###################
# Kolla options # Kolla options
################### ###################
# Valid options are [ CONFIG_EXTERNAL_COPY_ONCE, CONFIG_EXTERNAL_COPY_ALWAYS ] # Valid options are [ COPY_ONCE, COPY_ALWAYS ]
#config_strategy: "CONFIG_EXTERNAL_COPY_ONCE" #config_strategy: "COPY_ONCE"
# Valid options are [ centos, fedora, oraclelinux, ubuntu ] # Valid options are [ centos, fedora, oraclelinux, ubuntu ]
#kolla_base_distro: "centos" #kolla_base_distro: "centos"