diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-09 17:18:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-09 17:18:55 +0000 |
| commit | 271486d4dab285077b5f4f904b5cb67c44bd392f (patch) | |
| tree | c950830eb19bb5d3190cc4e2b29dbfceb1dd6853 | |
| parent | ab9441bac677d02a9610d50df2a8440e04eb3a78 (diff) | |
| parent | 9f730537d277e90ba35a528aad324e9fe476a154 (diff) | |
| download | kolla-271486d4dab285077b5f4f904b5cb67c44bd392f.tar.gz kolla-271486d4dab285077b5f4f904b5cb67c44bd392f.zip | |
Merge "Remove config-internal from galera"
| l--------- | docker/centos/binary/galera/config-internal.sh | 1 | ||||
| -rwxr-xr-x | docker/common/galera/config-internal.sh | 23 | ||||
| -rwxr-xr-x | docker/common/galera/start.sh | 2 |
3 files changed, 1 insertions, 25 deletions
diff --git a/docker/centos/binary/galera/config-internal.sh b/docker/centos/binary/galera/config-internal.sh deleted file mode 120000 index edab3d51f..000000000 --- a/docker/centos/binary/galera/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/galera/config-internal.sh
\ No newline at end of file diff --git a/docker/common/galera/config-internal.sh b/docker/common/galera/config-internal.sh deleted file mode 100755 index d92414a6f..000000000 --- a/docker/common/galera/config-internal.sh +++ /dev/null @@ -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 diff --git a/docker/common/galera/start.sh b/docker/common/galera/start.sh index 42bd882b1..f8f8d7f77 100755 --- a/docker/common/galera/start.sh +++ b/docker/common/galera/start.sh @@ -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 |