summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2018-02-08 16:54:15 -0500
committerGitHub <noreply@github.com>2018-02-08 16:54:15 -0500
commitf0f1188f622b7060112ebb59056da3d249b9f513 (patch)
tree6b9f73b1e1b2efc75c13d1ba75363dc5a3f8dca0
parent13ebefef2b821c01c091647b2ee17c6d649d0335 (diff)
parent793b1d11f6e09e3ebfa4cb998cadddd88a52b006 (diff)
downloadopenshift-f0f1188f622b7060112ebb59056da3d249b9f513.tar.gz
openshift-f0f1188f622b7060112ebb59056da3d249b9f513.tar.bz2
openshift-f0f1188f622b7060112ebb59056da3d249b9f513.tar.xz
openshift-f0f1188f622b7060112ebb59056da3d249b9f513.zip
Merge pull request #7055 from fabianvf/bz1541625
Bug 1541625- properly cast provided ip address to unicode
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py4
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')