openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Add TypeError exception when parsing addresses" into stable/wallaby

This commit is contained in:
Zuul 2022-04-26 23:17:05 +00:00 committed by Gerrit Code Review
parent a0add6b685 3e100fa9ad
commit f6181ad8b6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleo_common/utils/common.py
View File

@ -23,5 +23,5 @@ def bracket_ipv6(address):
try:
socket.inet_pton(socket.AF_INET6, address)
return "[%s]" % address
except socket.error:
except (socket.error, TypeError):
return address

7
tripleo_common/utils/overcloudrc.py
View File

@ -90,8 +90,11 @@ def _create_overcloudrc_from_outputs(
host = urllib.parse.urlparse(endpoint).hostname
no_proxy_list = no_proxy.split(',')
no_proxy_list = map(common_utils.bracket_ipv6,
no_proxy_list + [host, admin_vip])
no_proxy_list.extend([host, admin_vip])
no_proxy_list = map(
common_utils.bracket_ipv6,
[i for i in no_proxy_list if i]
)
# Remove duplicated entries
no_proxy_list = sorted(list(set(no_proxy_list)))