summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master_facts
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2017-03-09 13:50:33 -0500
committerJason DeTiberus <jdetiber@redhat.com>2017-03-09 13:50:33 -0500
commit1100f5a76dff38a1f191f7b3ae42ec13bfc3c43e (patch)
tree424cb5d71bbfc1aa1e350aca5c0ca04147d14978 /roles/openshift_master_facts
parent2e37c702c8d4c3778d172d8e886f68e23d4aeebc (diff)
downloadopenshift-1100f5a76dff38a1f191f7b3ae42ec13bfc3c43e.tar.gz
openshift-1100f5a76dff38a1f191f7b3ae42ec13bfc3c43e.tar.bz2
openshift-1100f5a76dff38a1f191f7b3ae42ec13bfc3c43e.tar.xz
openshift-1100f5a76dff38a1f191f7b3ae42ec13bfc3c43e.zip
Use ansible.compat.six where possible
Diffstat (limited to 'roles/openshift_master_facts')
-rw-r--r--roles/openshift_master_facts/filter_plugins/openshift_master.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/roles/openshift_master_facts/filter_plugins/openshift_master.py b/roles/openshift_master_facts/filter_plugins/openshift_master.py
index db24028cd..01806c97f 100644
--- a/roles/openshift_master_facts/filter_plugins/openshift_master.py
+++ b/roles/openshift_master_facts/filter_plugins/openshift_master.py
@@ -7,12 +7,16 @@ Custom filters for use in openshift-master
import copy
import sys
+# pylint import-error disabled because pylint cannot find the package
+# when installed in a virtualenv
from distutils.version import LooseVersion # pylint: disable=no-name-in-module,import-error
from ansible import errors
from ansible.parsing.yaml.dumper import AnsibleDumper
from ansible.plugins.filter.core import to_bool as ansible_bool
-from six import string_types
+# pylint import-error disabled because pylint cannot find the package
+# when installed in a virtualenv
+from ansible.compat.six import string_types # pylint: disable=no-name-in-module,import-error
import yaml