From: Jiri Stransky <jistr@redhat.com>
Date: Wed, 24 Aug 2016 11:21:59 +0000 (+0200)
Subject: Fix check for MariaDB upgrade manual switch off
X-Git-Tag: opnfv-6.0.0~1729^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f45897ea1eb2f64910c2a41f32579db34fa62e78;p=apex-tripleo-heat-templates.git

Fix check for MariaDB upgrade manual switch off

The MySqlMajorUpgrade parameter has validation on it allowing only
values yes/no/auto, however in the script we checked for '0' instead of
'no', which means the only effective values were yes/auto. This is now
fixed to allow switching the migration off.

Change-Id: I5d64734894c6bfd9003ad643f3747e34e62465cc
Closes-Bug: #1616429
---

diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh
index 36d85444..d67d5a1a 100755
--- a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh
+++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh
@@ -50,7 +50,7 @@ if [ "$mariadb_do_major_upgrade" = "auto" ]; then
         DO_MYSQL_UPGRADE=0
     fi
     echo "mysql upgrade required: $DO_MYSQL_UPGRADE"
-elif [ "$mariadb_do_major_upgrade" = 0 ]; then
+elif [ "$mariadb_do_major_upgrade" = "no" ]; then
     DO_MYSQL_UPGRADE=0
 else
     DO_MYSQL_UPGRADE=1