From efbfd7912b5fff41a3d3060af9e64c35c7e89f3b Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Thu, 25 Jun 2015 14:33:28 +0000 Subject: 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 --- docker/common/base/kolla-common.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docker/common/base') 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 -- cgit v1.2.3