From 8dfc2cf3a3963c35bcef39dfa0464bddbffb744a Mon Sep 17 00:00:00 2001 From: Steve Wilkerson <wilkers.steve@gmail.com> Date: Sat, 29 Jul 2017 10:35:48 -0500 Subject: [PATCH] Fix mariadb start script Fixes the reference to mariadb replicas used when adding pods to the mariadb cluster. This was causing nodes to not be added to the cluster properly Change-Id: I9df586c8939e241ea58d933652c767542fd364ff --- mariadb/templates/bin/_start.sh.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mariadb/templates/bin/_start.sh.tpl b/mariadb/templates/bin/_start.sh.tpl index 83536ae79f..9442bf30cd 100644 --- a/mariadb/templates/bin/_start.sh.tpl +++ b/mariadb/templates/bin/_start.sh.tpl @@ -43,7 +43,7 @@ fi CLUSTER_CONFIG_PATH=/etc/mysql/conf.d/10-cluster-config.cnf MEMBERS= -for i in $(seq 1 {{ .Values.replicas }}); do +for i in $(seq 1 {{ .Values.pod.replicas.server }}); do NUM=$(expr $i - 1) CANDIDATE_POD="${SERVICE_NAME}-$NUM.${DISCOVERY_SERVICE_NAME}" if [ "x${CANDIDATE_POD}" != "x${POD_NAME}.${DISCOVERY_SERVICE_NAME}" ]; then @@ -66,7 +66,7 @@ wsrep_node_name=${POD_NAME}.${DISCOVERY_SERVICE_NAME} EOS echo ^^^ -echo Executinging upstream docker-entrypoint. +echo Executing upstream docker-entrypoint. echo #