openstack/kolla-ansible
Code Issues Proposed changes

Merge "Remove config-internal from galera"

Browse Source
This commit is contained in:
Jenkins 2015-08-09 17:18:55 +00:00 committed by Gerrit Code Review
commit 271486d4da
3 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/centos/binary/galera/config-internal.sh
View File

@ -1 +0,0 @@
../../../common/galera/config-internal.sh

23
docker/common/galera/config-internal.sh
View File

@ -1,23 +0,0 @@
#!/bin/bash
. /opt/kolla/kolla-common.sh
. /opt/kolla/config-galera.sh
check_required_vars DB_CLUSTER_BIND_ADDRESS \
DB_CLUSTER_INIT_DB \
DB_CLUSTER_NAME \
DB_CLUSTER_NODES \
DB_CLUSTER_WSREP_METHOD \
DB_ROOT_PASSWORD
CFG=/etc/my.cnf.d/server.cnf
DB_CLUSTER_INIT_SQL=/tmp/mysql-first-time.sql
prepare_db
if [[ "${DB_CLUSTER_INIT_DB}" == "true" ]] && ! [[ -a /var/lib/mysql/cluster.exists ]]; then
DB_CLUSTER_IS_MASTER_NODE="--wsrep-new-cluster"
touch /var/lib/mysql/cluster.exists
fi
mysqld_safe --init-file=$DB_CLUSTER_INIT_SQL $DB_CLUSTER_IS_MASTER_NODE

2
docker/common/galera/start.sh
View File

@ -8,7 +8,7 @@ ARGS=""
# loading common functions
source /opt/kolla/kolla-common.sh
# config-internal script exec out of this function, it does not return here
# Execute config strategy
set_configs
# loading functions