diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-27 13:06:35 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-27 13:26:02 +0000 |
| commit | 9f5edb4afc3061fc44fd1a9b66207f29d879ab97 (patch) | |
| tree | 652a841c873f2f9689667c27fe2c9f6b0bc62da7 /docker/common | |
| parent | aada29b4dbf65eae105a59389813e96418e33bf5 (diff) | |
| download | kolla-9f5edb4afc3061fc44fd1a9b66207f29d879ab97.tar.gz kolla-9f5edb4afc3061fc44fd1a9b66207f29d879ab97.zip | |
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
Diffstat (limited to 'docker/common')
| -rw-r--r-- | docker/common/base/kolla-common.sh | 8 |
1 files changed, 2 insertions, 6 deletions
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 |