diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-03-20 11:19:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-20 11:19:08 -0500 |
| commit | a95796198be559236cd4c2d297b77785f98dc166 (patch) | |
| tree | 78521c47e888e705f1c37ccc5524c58557e6cb66 | |
| parent | b6aa824eb212ff968cc4b925bb32c05ef2ebd61d (diff) | |
| parent | f7b608380a951a768e455c9a6f8c7c1005c82afb (diff) | |
| download | openshift-a95796198be559236cd4c2d297b77785f98dc166.tar.gz openshift-a95796198be559236cd4c2d297b77785f98dc166.tar.bz2 openshift-a95796198be559236cd4c2d297b77785f98dc166.tar.xz openshift-a95796198be559236cd4c2d297b77785f98dc166.zip | |
Merge pull request #3707 from rhcarvalho/openshift_facts-no-six
Merged by openshift-bot
| -rw-r--r-- | roles/openshift_facts/vars/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_health_checker/openshift_checks/__init__.py | 9 |
2 files changed, 3 insertions, 7 deletions
diff --git a/roles/openshift_facts/vars/main.yml b/roles/openshift_facts/vars/main.yml index 07f5100ad..053a4cfc8 100644 --- a/roles/openshift_facts/vars/main.yml +++ b/roles/openshift_facts/vars/main.yml @@ -2,7 +2,6 @@ required_packages: - iproute - python-dbus - - python-six - PyYAML - yum-utils diff --git a/roles/openshift_health_checker/openshift_checks/__init__.py b/roles/openshift_health_checker/openshift_checks/__init__.py index f66d19fbf..93547a2e0 100644 --- a/roles/openshift_health_checker/openshift_checks/__init__.py +++ b/roles/openshift_health_checker/openshift_checks/__init__.py @@ -8,11 +8,8 @@ import os from abc import ABCMeta, abstractmethod, abstractproperty from importlib import import_module -# add_metaclass is not available in the embedded six from module_utils in Ansible 2.2.1 -from six import add_metaclass -# pylint import-error disabled because pylint cannot find the package -# when installed in a virtualenv -from ansible.module_utils.six.moves import reduce # pylint: disable=import-error, redefined-builtin +from ansible.module_utils import six +from ansible.module_utils.six.moves import reduce # pylint: disable=import-error,redefined-builtin class OpenShiftCheckException(Exception): @@ -20,7 +17,7 @@ class OpenShiftCheckException(Exception): pass -@add_metaclass(ABCMeta) +@six.add_metaclass(ABCMeta) class OpenShiftCheck(object): """A base class for defining checks for an OpenShift cluster environment.""" |