diff options
| author | Sam Yaple <sam@yaple.net> | 2015-06-25 14:33:28 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-07-03 13:56:06 +0000 |
| commit | efbfd7912b5fff41a3d3060af9e64c35c7e89f3b (patch) | |
| tree | f8b01517282cc2314d5ec2765d0a2e7643f7ff48 /docker/common/base | |
| parent | 90d92347e83e348ef5e2f1ed2faba2a3820ab436 (diff) | |
| download | kolla-efbfd7912b5fff41a3d3060af9e64c35c7e89f3b.tar.gz kolla-efbfd7912b5fff41a3d3060af9e64c35c7e89f3b.zip | |
Ansible Mariadb w/ Galera support
Adds initial support for Mariadb with Galera replication in Ansible
using the CONFIG_EXTERNAL methods.
Additionally, this refactors some of the Galera config script to allow
for reuse by CONFIG_EXTERNAL.
Partially Implements: blueprint ansible-service
Change-Id: I566fea0376ecca39fc8a5167f9ff9ff434ea7b7e
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 |