[node-patches] Change in ovirt-node[master]: collectd: Disable on el6 by default

[fabiand at redhat.com]

Fabian Deutsch has uploaded a new change for review.

Change subject: collectd: Disable on el6 by default
......................................................................

collectd: Disable on el6 by default

Change-Id: I825660cd0947c57995f2448301e076cb6a5bdfe6
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1130884
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M scripts/ovirt-auto-install.py
M src/ovirt/node/utils/system.py
2 files changed, 10 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/33/32533/1

diff --git a/scripts/ovirt-auto-install.py b/scripts/ovirt-auto-install.py
index 3244404..272390c 100755
--- a/scripts/ovirt-auto-install.py
+++ b/scripts/ovirt-auto-install.py
@@ -27,7 +27,8 @@
 from ovirt.node.utils import system
 from ovirt.node.utils import security, storage, hooks
 from ovirt.node.config import defaults
-from ovirt.node.utils.system import which, kernel_cmdline_arguments
+from ovirt.node.utils.system import which, kernel_cmdline_arguments, \
+    SystemRelease
 import logging
 import sys
 import os
@@ -260,7 +261,8 @@
 
     tx.append(ConfigureLogging())
 
-    tx.append(ConfigureCollectd())
+    if not SystemRelease().is_el():
+        tx.append(ConfigureCollectd())
 
     tx.append(PerformInstallation())  # FIXME needed??
 
diff --git a/src/ovirt/node/utils/system.py b/src/ovirt/node/utils/system.py
index b1356fe..5955a8b 100644
--- a/src/ovirt/node/utils/system.py
+++ b/src/ovirt/node/utils/system.py
@@ -425,10 +425,14 @@
         return File(self.CPE_FILE).read().strip()
 
     def is_fedora(self):
-        """Determin if this system is a fedora system
-        """
         return self.VENDOR.lower() == "fedoraproject"
 
+    def is_centos(self):
+        return self.VENDOR.lower() == "centos"
+
+    def is_redhat(self):
+        return self.VENDOR.lower() == "redhat"
+
     def is_el(self):
         """Determin if this system is an "enterprise linux" (RHEL, CentOS)
         """


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I825660cd0947c57995f2448301e076cb6a5bdfe6
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at redhat.com>