From 7088e885f82144a23df56faa1e0c7d75f29de071 Mon Sep 17 00:00:00 2001 From: rthallisey Date: Thu, 27 Aug 2015 16:18:17 -0400 Subject: Replace config-external with a JSON file for Galera Change-Id: I82abc9a31571376679c4f463f5a6ae77a49ec2f6 Partially-Implements: blueprint replace-config-external --- docker/mariadb/start.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'docker') diff --git a/docker/mariadb/start.sh b/docker/mariadb/start.sh index 986cca733..f33dc7493 100755 --- a/docker/mariadb/start.sh +++ b/docker/mariadb/start.sh @@ -2,16 +2,14 @@ set -o errexit -CMD="/usr/bin/mysqld_safe" -ARGS="" - -# loading common functions +# Loading common functions source /opt/kolla/kolla-common.sh -# Execute config strategy -set_configs +# Generate run command +python /opt/kolla/set_configs.py +CMD=$(cat /command_options) -# loading functions +# Loading functions source /opt/kolla/config/config-galera.sh chown mysql: /var/lib/mysql @@ -22,6 +20,9 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]] && [[ ! -e /var/lib/mysql/cluster.exists ]]; t touch /var/lib/mysql/cluster.exists populate_db bootstrap_db + exec $CMD $ARGS + exit 0 fi -exec $CMD $ARGS +echo "Running command: ${CMD}" +exec $CMD -- cgit v1.2.3