diff options
| author | Fabian von Feilitzsch <fabian@fabianism.us> | 2018-01-24 16:00:24 -0500 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2018-01-24 17:15:44 -0500 |
| commit | 59615091a29807550d5dea3a404f7d0eb25387cf (patch) | |
| tree | af83c90f155970a7c3ed4b5255b65eedf045547c /roles/openshift_facts/library | |
| parent | 2bbdf2984c5b4d59ecdc773ed8e40aa340092922 (diff) | |
| download | openshift-59615091a29807550d5dea3a404f7d0eb25387cf.tar.gz openshift-59615091a29807550d5dea3a404f7d0eb25387cf.tar.bz2 openshift-59615091a29807550d5dea3a404f7d0eb25387cf.tar.xz openshift-59615091a29807550d5dea3a404f7d0eb25387cf.zip | |
Make IP object a string
Diffstat (limited to 'roles/openshift_facts/library')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 16b6ea53c..58965f0cb 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -18,6 +18,7 @@ import socket import ipaddress from distutils.util import strtobool from distutils.version import LooseVersion +from ansible.module_utils.six import u from ansible.module_utils.six import string_types from ansible.module_utils.six.moves import configparser @@ -1147,7 +1148,7 @@ def set_proxy_facts(facts): if 'no_proxy_internal_hostnames' in common: common['no_proxy'].extend(common['no_proxy_internal_hostnames'].split(',')) # We always add local dns domain and ourselves no matter what - kube_svc_ip = ipaddress.ip_network(unicode(common['portal_net']))[1] + kube_svc_ip = str(ipaddress.ip_network(u(common['portal_net']))[1]) common['no_proxy'].append(kube_svc_ip) common['no_proxy'].append('.' + common['dns_domain']) common['no_proxy'].append('.svc') |