diff options
| author | OpenShift Bot <dmcphers+openshiftbot@redhat.com> | 2017-03-10 09:25:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-10 09:25:00 -0500 |
| commit | 23ba89e0a51c7b34813da2d47e8735cd996e46c1 (patch) | |
| tree | e89108792044461343b6fc8d40e5a31c0c1434ae /roles/openshift_master_facts/filter_plugins/openshift_master.py | |
| parent | f36f78c63762f1764f25e135e576ca619a9ba7d3 (diff) | |
| parent | 1100f5a76dff38a1f191f7b3ae42ec13bfc3c43e (diff) | |
| download | openshift-23ba89e0a51c7b34813da2d47e8735cd996e46c1.tar.gz openshift-23ba89e0a51c7b34813da2d47e8735cd996e46c1.tar.bz2 openshift-23ba89e0a51c7b34813da2d47e8735cd996e46c1.tar.xz openshift-23ba89e0a51c7b34813da2d47e8735cd996e46c1.zip | |
Merge pull request #3613 from detiber/module_utils_six
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_master_facts/filter_plugins/openshift_master.py')
| -rw-r--r-- | roles/openshift_master_facts/filter_plugins/openshift_master.py | 6 |
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 |