[vdsm/f20] Revert "Adding 4.14.2 tag to branch"

[Douglas Schilling Landgraf]

commit 9a3c1e516014f6243eb95e00bda786ff63890230
Author: Douglas Schilling Landgraf <dougsland at redhat.com>
Date:   Mon Feb 10 10:51:27 2014 -0500

    Revert "Adding 4.14.2 tag to branch"
    
    This reverts commit 522dc035a8a30bf4d41485e36942c12ddd8453f0.

 0001-Adding-configure-sanlock-on-force.patch |   42 ++++++++++++++++++++++++++
 sources                                      |    2 +-
 vdsm.spec                                    |   13 +++++---
 3 files changed, 51 insertions(+), 6 deletions(-)
---
diff --git a/0001-Adding-configure-sanlock-on-force.patch b/0001-Adding-configure-sanlock-on-force.patch
new file mode 100644
index 0000000..8ebef51
--- /dev/null
+++ b/0001-Adding-configure-sanlock-on-force.patch
@@ -0,0 +1,42 @@
+From 3a1895662d4a82d531b6ca7333874a579410f22f Mon Sep 17 00:00:00 2001
+From: Yaniv Bronhaim <ybronhei at redhat.com>
+Date: Mon, 3 Feb 2014 18:13:43 +0200
+Subject: [PATCH] Adding configure sanlock on force
+
+If sanlock is down we cannot check sanlock process, so isconfigure return that
+sanlock process is already related to the supplementary group.
+Configure verb won't configure sanlock if isconfigure return True currently.
+Therefore, this patch change the ConfigureOnForce to True so
+'vdsm-tool configure --force' will perform the usermod action as the
+user expected.
+
+Change-Id: I0bb3125e64cf02e55738f5978fd81d605dd84d38
+Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1057225
+Signed-off-by: Yaniv Bronhaim <ybronhei at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/24007
+Reviewed-by: Sandro Bonazzola <sbonazzo at redhat.com>
+Reviewed-by: Dan Kenigsberg <danken at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/24153
+---
+ lib/vdsm/tool/configurator.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/lib/vdsm/tool/configurator.py b/lib/vdsm/tool/configurator.py
+index dfc4115..29172e4 100644
+--- a/lib/vdsm/tool/configurator.py
++++ b/lib/vdsm/tool/configurator.py
+@@ -175,7 +175,10 @@ class SanlockModuleConfigure(_ModuleConfigure):
+         return configured
+ 
+     def reconfigureOnForce(self):
+-        return False
++        # If sanlock is down isconfigure returns True and configure will skip
++        # sanlock configure. on force users expected to run configure even if
++        # isconfigure returned True.
++        return True
+ 
+ 
+ __configurers = (
+-- 
+1.8.5.3
+
diff --git a/sources b/sources
index 793c592..89af15a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-19d90c49868c6b9fe6decdbef67a80a2  vdsm-4.14.2.tar.gz
+bb47fc8c9413620e1227a2c28a5aba0b  vdsm-4.13.3.tar.gz
diff --git a/vdsm.spec b/vdsm.spec
index 4e0f11d..91bd2db 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -49,8 +49,8 @@
 %endif
 
 Name:           %{vdsm_name}
-Version:        4.14.2
-Release:        0%{?dist}%{?extra_release}
+Version:        4.14.1
+Release:        4%{?dist}%{?extra_release}
 Summary:        Virtual Desktop Server Manager
 
 Group:          Applications/System
@@ -64,6 +64,8 @@ Url:            http://www.ovirt.org/wiki/Vdsm
 #  ./autogen.sh --system
 #  make VERSION={version}-{vdsm_release} dist
 Source0:        %{vdsm_name}-%{version}%{?vdsm_relttag}.tar.gz
+# ovirt-3.4 patches
+Patch0:         0001-Adding-configure-sanlock-on-force.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -605,6 +607,8 @@ Gluster plugin enables VDSM to serve Gluster functionalities.
 
 %prep
 %setup -q
+# ovirt-3.4 patches
+%patch0 -p1
 
 %if 0%{?rhel} == 6
 sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in
@@ -1444,9 +1448,8 @@ exit 0
 %endif
 
 %changelog
-* Mon Feb 10 2014 Yaniv Bronhaim <ybronhei at redhat.com - 4.14.2-0
-- Build from tag 4.14.2
-- Additional Patch: Adding configure sanlock on force
+* Thu Feb 06 2014 Yaniv Bronhaim <ybronhei at redhat.com - 4.14.1-4
+- Adding configure sanlock on force
 
 * Wed Feb 05 2014 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.14.1-3
 - execCmd with sudo=root raise require tty fault when running as root