diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-04 06:51:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-04 06:51:44 +0000 |
| commit | 097734fbe06d4b52fabb2ec5edecb2ebb782db2e (patch) | |
| tree | a935773de3600f35724cdd88e946ef66603f53e6 /docker/common/base | |
| parent | bf8d20826fe59a64a11f224578b36cedf72535e9 (diff) | |
| parent | efbfd7912b5fff41a3d3060af9e64c35c7e89f3b (diff) | |
| download | kolla-097734fbe06d4b52fabb2ec5edecb2ebb782db2e.tar.gz kolla-097734fbe06d4b52fabb2ec5edecb2ebb782db2e.zip | |
Merge "Ansible Mariadb w/ Galera support"
Diffstat (limited to 'docker/common/base')
| -rw-r--r-- | docker/common/base/kolla-common.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docker/common/base/kolla-common.sh b/docker/common/base/kolla-common.sh index bd6a539a0..5c07b375d 100644 --- a/docker/common/base/kolla-common.sh +++ b/docker/common/base/kolla-common.sh @@ -175,19 +175,19 @@ set_configs() { exec /opt/kolla/config-internal.sh ;; CONFIG_EXTERNAL_COPY_ALWAYS) - source /opt/kolla/config-exernal.sh + source /opt/kolla/config-external.sh ;; CONFIG_EXTERNAL_COPY_ONCE) if [[ -f /configured ]]; then echo 'INFO - This container has already been configured; Refusing to copy new configs' - return + else + source /opt/kolla/config-external.sh + touch /configured fi - source /opt/kolla/config-exernal.sh - touch /configured ;; *) - echo '$CONFIG_STRATEGY is not set properly' + echo '$KOLLA_CONFIG_STRATEGY is not set properly' exit 1 ;; esac |