diff options
| author | Fabian von Feilitzsch <fabian@fabianism.us> | 2018-02-07 14:05:51 -0500 |
|---|---|---|
| committer | Fabian von Feilitzsch <fabian@fabianism.us> | 2018-02-07 14:05:51 -0500 |
| commit | 793b1d11f6e09e3ebfa4cb998cadddd88a52b006 (patch) | |
| tree | 305279bd7fc1d7a625ea0038c9f63be53e78032e /roles/openshift_facts | |
| parent | 4fe53adf947c7d202f0fc53569891af322e2a5f3 (diff) | |
| download | openshift-793b1d11f6e09e3ebfa4cb998cadddd88a52b006.tar.gz openshift-793b1d11f6e09e3ebfa4cb998cadddd88a52b006.tar.bz2 openshift-793b1d11f6e09e3ebfa4cb998cadddd88a52b006.tar.xz openshift-793b1d11f6e09e3ebfa4cb998cadddd88a52b006.zip | |
Bug 1541625- properly cast provided ip address to unicode
Diffstat (limited to 'roles/openshift_facts')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 11a51b6bb..8d0f615b5 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -18,7 +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 text_type from ansible.module_utils.six import string_types from ansible.module_utils.six.moves import configparser @@ -1153,7 +1153,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 = str(ipaddress.ip_network(u(common['portal_net']))[1]) + kube_svc_ip = str(ipaddress.ip_network(text_type(common['portal_net']))[1]) common['no_proxy'].append(kube_svc_ip) common['no_proxy'].append('.' + common['dns_domain']) common['no_proxy'].append('.svc') |