diff options
| author | rthallisey <rhallise@redhat.com> | 2015-08-27 16:18:17 -0400 |
|---|---|---|
| committer | Ryan Hallisey <rhallise@redhat.com> | 2015-09-16 10:33:29 -0400 |
| commit | 7088e885f82144a23df56faa1e0c7d75f29de071 (patch) | |
| tree | d2feeba6b599750a9f03afff641b77561c790203 /docker | |
| parent | 3d7f9fd624ce058cc43371e97425c5f2091d9c2b (diff) | |
| download | kolla-7088e885f82144a23df56faa1e0c7d75f29de071.tar.gz kolla-7088e885f82144a23df56faa1e0c7d75f29de071.zip | |
Replace config-external with a JSON file for Galera
Change-Id: I82abc9a31571376679c4f463f5a6ae77a49ec2f6
Partially-Implements: blueprint replace-config-external
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/mariadb/start.sh | 17 |
1 files changed, 9 insertions, 8 deletions
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 |