summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts
diff options
context:
space:
mode:
authorOpenShift Bot <dmcphers+openshiftbot@redhat.com>2017-03-10 09:25:00 -0500
committerGitHub <noreply@github.com>2017-03-10 09:25:00 -0500
commit23ba89e0a51c7b34813da2d47e8735cd996e46c1 (patch)
treee89108792044461343b6fc8d40e5a31c0c1434ae /roles/openshift_facts
parentf36f78c63762f1764f25e135e576ca619a9ba7d3 (diff)
parent1100f5a76dff38a1f191f7b3ae42ec13bfc3c43e (diff)
downloadopenshift-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_facts')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py4
-rw-r--r--roles/openshift_facts/vars/main.yml1
2 files changed, 2 insertions, 3 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 8ea900e21..eeab8a99c 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -19,8 +19,8 @@ import struct
import socket
from distutils.util import strtobool
from distutils.version import LooseVersion
-from six import string_types, text_type
-from six.moves import configparser
+from ansible.module_utils.six import string_types, text_type
+from ansible.module_utils.six.moves import configparser
# ignore pylint errors related to the module_utils import
# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import
diff --git a/roles/openshift_facts/vars/main.yml b/roles/openshift_facts/vars/main.yml
index 07f5100ad..053a4cfc8 100644
--- a/roles/openshift_facts/vars/main.yml
+++ b/roles/openshift_facts/vars/main.yml
@@ -2,7 +2,6 @@
required_packages:
- iproute
- python-dbus
- - python-six
- PyYAML
- yum-utils