summaryrefslogtreecommitdiffstats
path: root/roles/openshift_health_checker
diff options
context:
space:
mode:
authorOpenShift Bot <dmcphers+openshiftbot@redhat.com>2017-03-10 09:25:00 -0500
committerGitHub <noreply@github.com>2017-03-10 09:25:00 -0500
commit23ba89e0a51c7b34813da2d47e8735cd996e46c1 (patch)
treee89108792044461343b6fc8d40e5a31c0c1434ae /roles/openshift_health_checker
parentf36f78c63762f1764f25e135e576ca619a9ba7d3 (diff)
parent1100f5a76dff38a1f191f7b3ae42ec13bfc3c43e (diff)
downloadopenshift-23ba89e0a51c7b34813da2d47e8735cd996e46c1.tar.gz
openshift-23ba89e0a51c7b34813da2d47e8735cd996e46c1.tar.bz2
openshift-23ba89e0a51c7b34813da2d47e8735cd996e46c1.tar.xz
openshift-23ba89e0a51c7b34813da2d47e8735cd996e46c1.zip
Merge pull request #3613 from detiber/module_utils_six
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_health_checker')
-rw-r--r--roles/openshift_health_checker/openshift_checks/__init__.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/roles/openshift_health_checker/openshift_checks/__init__.py b/roles/openshift_health_checker/openshift_checks/__init__.py
index 2c70438c9..50f26765b 100644
--- a/roles/openshift_health_checker/openshift_checks/__init__.py
+++ b/roles/openshift_health_checker/openshift_checks/__init__.py
@@ -2,13 +2,15 @@
Health checks for OpenShift clusters.
"""
+import operator
import os
+
from abc import ABCMeta, abstractmethod, abstractproperty
from importlib import import_module
-import operator
-import six
-from six.moves import reduce
+# pylint import-error disabled because pylint cannot find the package
+# when installed in a virtualenv
+from ansible.module_utils.six.moves import add_metaclass, reduce # pylint: disable=import-error, redefined-builtin
class OpenShiftCheckException(Exception):
@@ -16,7 +18,7 @@ class OpenShiftCheckException(Exception):
pass
-@six.add_metaclass(ABCMeta)
+@add_metaclass(ABCMeta)
class OpenShiftCheck(object):
"""A base class for defining checks for an OpenShift cluster environment."""