diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-17 10:31:16 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-20 11:37:55 -0400 |
| commit | af07f60e2e5c9c26ab1ef1d0ecc0565672a85f56 (patch) | |
| tree | 47a532ae4d72eef2068a1bf8260eafabeafdef2e /src/lib/Bcfg2/Server/Plugins/Ohai.py | |
| parent | 3ea977825739b1c15c04ca053cc44bcfacf9cfb9 (diff) | |
| download | bcfg2-af07f60e2e5c9c26ab1ef1d0ecc0565672a85f56.tar.gz bcfg2-af07f60e2e5c9c26ab1ef1d0ecc0565672a85f56.tar.bz2 bcfg2-af07f60e2e5c9c26ab1ef1d0ecc0565672a85f56.zip | |
added json, md5 to Bcfg2.Compat
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Ohai.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Ohai.py | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Ohai.py b/src/lib/Bcfg2/Server/Plugins/Ohai.py index 20f9ba877..35e385a77 100644 --- a/src/lib/Bcfg2/Server/Plugins/Ohai.py +++ b/src/lib/Bcfg2/Server/Plugins/Ohai.py @@ -1,22 +1,10 @@ import lxml.etree import os - import logging -logger = logging.getLogger('Bcfg2.Plugins.Ohai') - import Bcfg2.Server.Plugin +from Bcfg2.Compat import json -try: - import json -except: - # FIXME: can be removed when server prereq is >= python 2.6 - # necessary for clients without the in-tree json module - try: - import simplejson as json - except: - logger.error("Unable to load any json modules. Make sure " - "python-simplejson is installed.") - raise ImportError +logger = logging.getLogger('Bcfg2.Plugins.Ohai') probecode = """#!/bin/sh |