Arik Hadas has uploaded a new change for review.

Change subject: Remove irs_enable configuration attribute
......................................................................

Remove irs_enable configuration attribute

The configuration of vdsm included an attribute called 'irs_enable'
which was supposed to make it possible to set a specific host as non
eligible to serve as SPM.

This configuration is not supported (the engine will just try to
initialize such host as SPM over and over again). Thus, this
configuration attribute is removed.

Change-Id: I7520f0691d10c7d79377724c1aadcae0173e5bae
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M lib/vdsm/config.py.in
M vdsm/clientIF.py
2 files changed, 6 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/21141/1

diff --git a/lib/vdsm/config.py.in b/lib/vdsm/config.py.in
index c0bdd53..391d771 100644
--- a/lib/vdsm/config.py.in
+++ b/lib/vdsm/config.py.in
@@ -183,8 +183,6 @@
     # Section: [irs]
     ('irs', [
 
-        ('irs_enable', 'true', None),
-
         ('repository', '@VDSMREPO@',
             'Image repository.'),
 
diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index 0b67e45..e696b01 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -249,13 +249,12 @@
 
     def _initIRS(self):
         self.irs = None
-        if config.getboolean('irs', 'irs_enable'):
-            try:
-                self.irs = Dispatcher(HSM())
-            except:
-                self.log.error("Error initializing IRS", exc_info=True)
-            else:
-                self.irs.registerDomainStateChangeCallback(self.contEIOVms)
+        try:
+            self.irs = Dispatcher(HSM())
+        except:
+            self.log.error("Error initializing IRS", exc_info=True)
+        else:
+            self.irs.registerDomainStateChangeCallback(self.contEIOVms)
 
     def _getUUIDSpecPath(self, uuid):
         try:


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7520f0691d10c7d79377724c1aadcae0173e5bae
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <aha...@redhat.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Reply via email to