diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-27 17:22:44 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-28 00:50:29 -0700 |
| commit | 3ca9ae380ee20a2c9d374ea2ddc0dab2841d859a (patch) | |
| tree | b8c589359ed6a434930554a231da794dfa2b4e8d | |
| parent | 08e765fc3dc5fe586473583519a878b6020fe09d (diff) | |
| download | kolla-3ca9ae380ee20a2c9d374ea2ddc0dab2841d859a.tar.gz kolla-3ca9ae380ee20a2c9d374ea2ddc0dab2841d859a.zip | |
Move kolla-common to bsae directory
Change-Id: Ie48e1d25f06a2b91d608edda7fae54ec1ad80f2a
Partially-Implements: blueprint remove-docker-dir
| -rw-r--r-- | docker/common/base/kolla-common.sh | 22 | ||||
| -rw-r--r--[l---------] | docker_templates/base/kolla-common.sh | 23 |
2 files changed, 22 insertions, 23 deletions
diff --git a/docker/common/base/kolla-common.sh b/docker/common/base/kolla-common.sh deleted file mode 100644 index cc960ca24..000000000 --- a/docker/common/base/kolla-common.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/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 -} diff --git a/docker_templates/base/kolla-common.sh b/docker_templates/base/kolla-common.sh index 03ffb4e73..cc960ca24 120000..100644 --- a/docker_templates/base/kolla-common.sh +++ b/docker_templates/base/kolla-common.sh @@ -1 +1,22 @@ -../../docker/common/base/kolla-common.sh
\ No newline at end of file +#!/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 +} |