Yaniv Bronhaim has uploaded a new change for review.

Change subject: Sign sanlock not configured when service down and stop 
reconfigure of force
......................................................................

Sign sanlock not configured when service down and stop reconfigure of force

Instead of handling the configuration of sanlock when service down by setting
reconfigure on force, return "not configured" if sanlock service down.
Setting reconfigureOnForce True caused troubles on upgrade when stopping
sanlock failed.

Change-Id: I58b2eef787a90073a06caf88b6847f34fbd042ed
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1088805
Signed-off-by: Yaniv Bronhaim <ybron...@redhat.com>
---
M lib/vdsm/tool/configurator.py
1 file changed, 2 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/07/28007/1

diff --git a/lib/vdsm/tool/configurator.py b/lib/vdsm/tool/configurator.py
index f0944f3..6a1542a 100644
--- a/lib/vdsm/tool/configurator.py
+++ b/lib/vdsm/tool/configurator.py
@@ -182,7 +182,7 @@
         except IOError as e:
             if e.errno == os.errno.ENOENT:
                 sys.stdout.write("sanlock service is not running\n")
-                configured = True
+                configured = False
             else:
                 raise
 
@@ -194,10 +194,7 @@
         return configured
 
     def reconfigureOnForce(self):
-        # 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
+        return False
 
 
 __configurers = (


-- 
To view, visit http://gerrit.ovirt.org/28007
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I58b2eef787a90073a06caf88b6847f34fbd042ed
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybron...@redhat.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Reply via email to