summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugins/Ohai.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Ohai.py')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Ohai.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Ohai.py b/src/lib/Bcfg2/Server/Plugins/Ohai.py
index 35e385a77..052597f84 100644
--- a/src/lib/Bcfg2/Server/Plugins/Ohai.py
+++ b/src/lib/Bcfg2/Server/Plugins/Ohai.py
@@ -2,7 +2,13 @@ import lxml.etree
import os
import logging
import Bcfg2.Server.Plugin
-from Bcfg2.Compat import json
+
+# pylint: disable=F0401
+try:
+ import json
+except ImportError:
+ import simplejson as json
+# pylint: enable=F0401
logger = logging.getLogger('Bcfg2.Plugins.Ohai')
@@ -19,6 +25,7 @@ else
fi
"""
+
class OhaiCache(object):
def __init__(self, dirname):
self.dirname = dirname