diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-24 14:12:07 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-25 11:58:48 -0400 |
commit | 47aebb16f15fe6f8ce29d8c6b105f10d8d64c295 (patch) | |
tree | 82b5fb2e640875a2013498b08f2cf114f3f36eb4 /src/lib/Bcfg2/Server/Plugins/Ohai.py | |
parent | 3428eab79ab21d1ecee6d2f8edff083a2cccdf79 (diff) | |
download | bcfg2-47aebb16f15fe6f8ce29d8c6b105f10d8d64c295.tar.gz bcfg2-47aebb16f15fe6f8ce29d8c6b105f10d8d64c295.tar.bz2 bcfg2-47aebb16f15fe6f8ce29d8c6b105f10d8d64c295.zip |
more pylint checks
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Ohai.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Ohai.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Ohai.py b/src/lib/Bcfg2/Server/Plugins/Ohai.py index 052597f84..fbb46f004 100644 --- a/src/lib/Bcfg2/Server/Plugins/Ohai.py +++ b/src/lib/Bcfg2/Server/Plugins/Ohai.py @@ -1,6 +1,9 @@ +"""The Ohai plugin is used to detect information about the client +operating system using ohai +(http://wiki.opscode.com/display/chef/Ohai) """ + import lxml.etree import os -import logging import Bcfg2.Server.Plugin # pylint: disable=F0401 @@ -10,10 +13,7 @@ except ImportError: import simplejson as json # pylint: enable=F0401 -logger = logging.getLogger('Bcfg2.Plugins.Ohai') - - -probecode = """#!/bin/sh +PROBECODE = """#!/bin/sh export PATH=$PATH:/sbin:/usr/sbin @@ -27,6 +27,8 @@ fi class OhaiCache(object): + """ Storage for Ohai output on the local filesystem so that the + output can be used by bcfg2-info, etc. """ def __init__(self, dirname): self.dirname = dirname self.cache = dict() @@ -68,14 +70,14 @@ class Ohai(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.Connector.__init__(self) self.probe = lxml.etree.Element('probe', name='Ohai', source='Ohai', interpreter='/bin/sh') - self.probe.text = probecode + self.probe.text = PROBECODE try: os.stat(self.data) - except: + except OSError: os.makedirs(self.data) self.cache = OhaiCache(self.data) - def GetProbes(self, meta, force=False): + def GetProbes(self, _): return [self.probe] def ReceiveData(self, meta, datalist): |