diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-17 10:52:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-17 10:52:22 -0500 |
| commit | 2e1a1328457315c0d434d5a0fe1660e07512f6bd (patch) | |
| tree | a0efd99770819064d56e7cf272957e3ec02aadd3 /utils | |
| parent | 6c6529d4f08b3b69ff166f05a526e572467dda01 (diff) | |
| parent | adb0ce309b92de60afd028a72e2e80cf165430b7 (diff) | |
| download | openshift-2e1a1328457315c0d434d5a0fe1660e07512f6bd.tar.gz openshift-2e1a1328457315c0d434d5a0fe1660e07512f6bd.tar.bz2 openshift-2e1a1328457315c0d434d5a0fe1660e07512f6bd.tar.xz openshift-2e1a1328457315c0d434d5a0fe1660e07512f6bd.zip | |
Merge pull request #6588 from vrutkovs/remove-ansible-compat-six
Don't use from ansible.module_utils.six as its no longer available in Ansible 2.4
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/src/ooinstall/ansible_plugins/facts_callback.py | 6 |
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 |