diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-27 15:46:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-27 15:46:53 +0000 |
| commit | 91ecc598757fa9a96c1dca1ecf1939ae7adc93d9 (patch) | |
| tree | 0330983acb0c7739523617c049e599dbb062f1e4 /docker | |
| parent | 3bb6ad27cb076b1638d3bfa07f5e9ecfe039d41e (diff) | |
| parent | 9f5edb4afc3061fc44fd1a9b66207f29d879ab97 (diff) | |
| download | kolla-91ecc598757fa9a96c1dca1ecf1939ae7adc93d9.tar.gz kolla-91ecc598757fa9a96c1dca1ecf1939ae7adc93d9.zip | |
Merge "Remove CONFIG_STRATEGY prefix"
Diffstat (limited to 'docker')
| -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 |