diff options
| author | Sam Yaple <sam@yaple.net> | 2015-09-27 11:38:25 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-09-27 13:44:50 +0000 |
| commit | 160f1cc0116bf93cfceffeb0149e525ba08eed3f (patch) | |
| tree | e04158c84cd05b3b9a1b9e75c5f2a223f94eafba /docker/base | |
| parent | 5e60d8ec873870fc7995b8ea006652a3381f523f (diff) | |
| download | kolla-160f1cc0116bf93cfceffeb0149e525ba08eed3f.tar.gz kolla-160f1cc0116bf93cfceffeb0149e525ba08eed3f.zip | |
remove set_configs
Change-Id: I9bb0a1fac63cc326234b0f06b1e56b43e0753279
Partially-Implements: blueprint replace-config-external
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/kolla-common.sh | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/docker/base/kolla-common.sh b/docker/base/kolla-common.sh index cc960ca24..0cbb04821 100644 --- a/docker/base/kolla-common.sh +++ b/docker/base/kolla-common.sh @@ -1,22 +1,5 @@ #!/bin/bash -set_configs() { - case $KOLLA_CONFIG_STRATEGY in - COPY_ALWAYS) - source /opt/kolla/config-external.sh - ;; - COPY_ONCE) - if [[ -f /configured ]]; then - echo 'INFO - This container has already been configured; Refusing to copy new configs' - else - source /opt/kolla/config-external.sh - touch /configured - fi - ;; - - *) - echo '$KOLLA_CONFIG_STRATEGY is not set properly' - exit 1 - ;; - esac -} +# Copying configs into place if needed and set run command +python /opt/kolla/set_configs.py +CMD=$(cat /run_command) |