From cbe5fcc2e226c38567c74d772eb94c71ec956d54 Mon Sep 17 00:00:00 2001
From: astokes <astokes@ef72aa8b-4018-0410-8976-d6e080ef94d8>
Date: Thu, 21 Jan 2010 21:07:24 +0000
Subject: trunk openais fix

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@696 ef72aa8b-4018-0410-8976-d6e080ef94d8
---
 src/lib/sos/plugins/openais.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/sos/plugins/openais.py b/src/lib/sos/plugins/openais.py
index 11aa12f3..140572a2 100644
--- a/src/lib/sos/plugins/openais.py
+++ b/src/lib/sos/plugins/openais.py
@@ -20,13 +20,16 @@ class openais(sos.plugintools.PluginBase):
     """
     def checkenabled(self):
         if self.isInstalled("openais") or os.path.exists("/usr/sbin/openais-confdb-display"):
-            return True
+            openais_ver = commands.getoutput("rpm -q --queryformat='%{VERSION}' openais")
+            v, r, m = openais_ver.split('.')
+            if int(r) >= 80 and int(m) >= 6:
+                return True
         return False
         
-    openais_config_opts = [('totem,token'), ('totem,consensus'),
-                           ('totem,token_retransmits_before_loss_const'),
-                           ('cman,quorum_dev_poll'), ('cman,expected_votes'),
-                           ('cman,two_node')]
+    openais_config_opts = [('totem','token'), ('totem','consensus'),
+                           ('totem','token_retransmits_before_loss_const'),
+                           ('cman','quorum_dev_poll'), ('cman','expected_votes'),
+                           ('cman','two_node')]
     
     def setup(self):
         self.collectExtOutput("openais-confdb-display")
-- 
cgit