From 9f730537d277e90ba35a528aad324e9fe476a154 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Fri, 7 Aug 2015 09:14:14 -0700
Subject: Remove config-internal from galera

Change-Id: I1d0c39a73d0cdd558c3f9fe3d3706430ee9976a2
Partially-implements: blueprint remove-config-internal
---
 docker/common/galera/config-internal.sh | 23 -----------------------
 docker/common/galera/start.sh           |  2 +-
 2 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100755 docker/common/galera/config-internal.sh

(limited to 'docker/common')

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
-- 
cgit v1.2.3