summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <dmcphers+openshiftbot@redhat.com>2017-03-13 18:36:17 -0400
committerGitHub <noreply@github.com>2017-03-13 18:36:17 -0400
commit0ee14573521daf459e9fa8609769c954425979d7 (patch)
treed564ba27e9aeea0c758692fc2c4afcd9db7b8323
parent565641083c6036574ee81d4d447f01053694503a (diff)
parentfb215f85478eb7494358777be64dd03534bb5bd6 (diff)
downloadopenshift-0ee14573521daf459e9fa8609769c954425979d7.tar.gz
openshift-0ee14573521daf459e9fa8609769c954425979d7.tar.bz2
openshift-0ee14573521daf459e9fa8609769c954425979d7.tar.xz
openshift-0ee14573521daf459e9fa8609769c954425979d7.zip
Merge pull request #3641 from detiber/fixSixError
Merged by openshift-bot
-rw-r--r--roles/openshift_facts/vars/main.yml1
-rw-r--r--roles/openshift_health_checker/openshift_checks/__init__.py4
2 files changed, 4 insertions, 1 deletions
diff --git a/roles/openshift_facts/vars/main.yml b/roles/openshift_facts/vars/main.yml
index 053a4cfc8..07f5100ad 100644
--- a/roles/openshift_facts/vars/main.yml
+++ b/roles/openshift_facts/vars/main.yml
@@ -2,6 +2,7 @@
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 50f26765b..8433923ed 100644
--- a/roles/openshift_health_checker/openshift_checks/__init__.py
+++ b/roles/openshift_health_checker/openshift_checks/__init__.py
@@ -8,9 +8,11 @@ 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 add_metaclass, reduce # pylint: disable=import-error, redefined-builtin
+from ansible.module_utils.six.moves import reduce # pylint: disable=import-error, redefined-builtin
class OpenShiftCheckException(Exception):