summaryrefslogtreecommitdiffstats
path: root/utils/src
diff options
context:
space:
mode:
authorVadim Rutkovsky <vrutkovs@redhat.com>2018-01-02 22:18:57 +0100
committerVadim Rutkovsky <vrutkovs@redhat.com>2018-01-12 10:28:17 +0100
commitadb0ce309b92de60afd028a72e2e80cf165430b7 (patch)
tree618b8b787fc7bc21feb875c11416ad4f7c66cd1e /utils/src
parent61d2be565fa12ad6f13a74532006b989d613eab2 (diff)
downloadopenshift-adb0ce309b92de60afd028a72e2e80cf165430b7.tar.gz
openshift-adb0ce309b92de60afd028a72e2e80cf165430b7.tar.bz2
openshift-adb0ce309b92de60afd028a72e2e80cf165430b7.tar.xz
openshift-adb0ce309b92de60afd028a72e2e80cf165430b7.zip
Don't use from ansible.module_utils.six as its no longer available in Ansible 2.4
Diffstat (limited to 'utils/src')
-rw-r--r--utils/src/ooinstall/ansible_plugins/facts_callback.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/utils/src/ooinstall/ansible_plugins/facts_callback.py b/utils/src/ooinstall/ansible_plugins/facts_callback.py
index 433e29dde..6251cd22b 100644
--- a/utils/src/ooinstall/ansible_plugins/facts_callback.py
+++ b/utils/src/ooinstall/ansible_plugins/facts_callback.py
@@ -7,11 +7,7 @@ import yaml
from ansible.plugins.callback import CallbackBase
from ansible.parsing.yaml.dumper import AnsibleDumper
-# ansible.compat.six goes away with Ansible 2.4
-try:
- from ansible.compat.six import u
-except ImportError:
- from ansible.module_utils.six import u
+from ansible.module_utils.six import u
# pylint: disable=super-init-not-called