From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Tue, 7 Nov 2017 07:57:22 +0000 (+0000)
Subject: Revert "Freeze the galera formula to avoid update"
X-Git-Tag: opnfv-6.0.0~280
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=36a3c2f40e49c51fb180cd03817aad1891e6f45e;p=fuel.git

Revert "Freeze the galera formula to avoid update"

This reverts commit f49340e1aac3f5e8bb009a9d0d35aa6fedba7384.
Version has been set back to 5.6 in upstream.

Change-Id: I06d6865e59cfbc5055322eb31cbb237075ebdcb1
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---

diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index a7948a70a..fc6b101b9 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -70,10 +70,6 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
 
   salt '*' state.sls ntp
 
-  # Freeze the galera formula to avoid update
-  salt-call pkg.install salt-formula-galera allow_updates=False refresh=False \
-    version=1.0+201710200646.13c9ec7~xenial1
-
   # Temporary fixup for mismatch between neutron formula and reclass model
   salt-call pkg.install salt-formula-neutron allow_updates=False refresh=False \
     version=2016.12.1+201709251458.f0607d9-1xenial1