openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Handle missing ipv6 boolean in network_data.yaml for Ceph"

This commit is contained in:
Zuul 2022-01-10 12:20:17 +00:00 committed by Gerrit Code Review
parent d63f84c6d9 79fa6fbe1c
commit 0b7713ffe5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tripleoclient/utils.py
View File

@ -3246,7 +3246,7 @@ def get_ceph_networks(network_data_path,
if ip_subnet in net:
return net[ip_subnet]
if 'subnets' in net:
ip_subnets = list(map(lambda x: x.get(ip_subnet),
ip_subnets = list(map(lambda x: x.get(ip_subnet, ''),
net['subnets'].values()))
return ','.join(ip_subnets)
@ -3274,9 +3274,11 @@ def get_ceph_networks(network_data_path,
if not subnet:
error = ("While searching %s, %s matched %s "
"but that network did not have a %s "
"value set."
"value set. To use an ipv6_subnet add "
"key 'ipv6: true' to %s in %s."
% (network_data_path, search_tag,
net_value, ip_subnet))
net_value, ip_subnet, net_value,
network_data_path))
raise RuntimeError(error)
else:
subnet_key = net_name.replace('_name', '')