summaryrefslogtreecommitdiffstats
path: root/roles
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 /roles
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 'roles')
-rw-r--r--roles/lib_utils/filter_plugins/oo_filters.py11
-rw-r--r--roles/lib_utils/filter_plugins/openshift_master.py6
2 files changed, 5 insertions, 12 deletions
diff --git a/roles/lib_utils/filter_plugins/oo_filters.py b/roles/lib_utils/filter_plugins/oo_filters.py
index fc14b5633..9f73510c4 100644
--- a/roles/lib_utils/filter_plugins/oo_filters.py
+++ b/roles/lib_utils/filter_plugins/oo_filters.py
@@ -21,13 +21,10 @@ import yaml
from ansible import errors
from ansible.parsing.yaml.dumper import AnsibleDumper
-# ansible.compat.six goes away with Ansible 2.4
-try:
- from ansible.compat.six import string_types, u
- from ansible.compat.six.moves.urllib.parse import urlparse
-except ImportError:
- from ansible.module_utils.six import string_types, u
- from ansible.module_utils.six.moves.urllib.parse import urlparse
+# pylint: disable=import-error,no-name-in-module
+from ansible.module_utils.six import string_types, u
+# pylint: disable=import-error,no-name-in-module
+from ansible.module_utils.six.moves.urllib.parse import urlparse
HAS_OPENSSL = False
try:
diff --git a/roles/lib_utils/filter_plugins/openshift_master.py b/roles/lib_utils/filter_plugins/openshift_master.py
index ff15f693b..e67b19c28 100644
--- a/roles/lib_utils/filter_plugins/openshift_master.py
+++ b/roles/lib_utils/filter_plugins/openshift_master.py
@@ -10,11 +10,7 @@ from ansible import errors
from ansible.parsing.yaml.dumper import AnsibleDumper
from ansible.plugins.filter.core import to_bool as ansible_bool
-# ansible.compat.six goes away with Ansible 2.4
-try:
- from ansible.compat.six import string_types, u
-except ImportError:
- from ansible.module_utils.six import string_types, u
+from ansible.module_utils.six import string_types, u
import yaml