From: Markos Chandras <mchandras@suse.de>
Date: Thu, 28 Sep 2017 13:22:34 +0000 (+0100)
Subject: xci: xci-deploy.sh: Apply workaround for checking db cluster on SUSE
X-Git-Tag: 6.0.0~291^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F63%2F43463%2F1;p=releng-xci.git

xci: xci-deploy.sh: Apply workaround for checking db cluster on SUSE

The mysql socket path is wrong on SUSE which leads to problems when
trying to verify the status of the db cluster. Apply workaround until
it's fixed upstream

controller00_galera_container-56c89184 | FAILED | rc=1 >>
ERROR 2002 (HY000): Can't connect to local MySQL server through socket '/var/run/mysqld/mysqld.sock' (2 "No such file or directory")

Change-Id: I23192f4079526ae7820a1db023a097a651a09140
Link: https://review.openstack.org/508154
Signed-off-by: Markos Chandras <mchandras@suse.de>
---

diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index 80ff53b6..fd3849be 100755
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@ -250,6 +250,13 @@ fi
 #-------------------------------------------------------------------------------
 echo "Info: Verifying database cluster"
 echo "-----------------------------------------------------------------------"
+# Apply SUSE fix until https://review.openstack.org/508154 is merged
+if [[ ${OS_FAMILY,,} == "suse" ]]; then
+	ssh root@$OPNFV_HOST_IP "ansible --ssh-extra-args='-o StrictHostKeyChecking=no' \
+		-i $OPENSTACK_OSA_PATH/playbooks/inventory/ galera_container -m shell \
+		-a \"sed -i \\\"s@/var/run/mysqld/mysqld.sock@/var/run/mysql/mysql.sock@\\\" /etc/my.cnf\""
+fi
+
 ssh root@$OPNFV_HOST_IP "ansible --ssh-extra-args='-o StrictHostKeyChecking=no' \
     -i $OPENSTACK_OSA_PATH/playbooks/inventory/ galera_container -m shell \
 	-a \"mysql -h localhost -e \\\"show status like '%wsrep_cluster_%';\\\"\" | tee galera.log"