Merge "UC/Standalone - Set ip_version in DeployedServerPortMap" into stable/wallaby

This commit is contained in:
Zuul 2021-11-10 19:48:09 +00:00 committed by Gerrit Code Review
commit f004ede757
1 changed files with 6 additions and 3 deletions

View File

@ -433,17 +433,20 @@ class Deploy(command.Command):
'DeployedServerPortMap': {
('%s-ctlplane' % hostname): {
'fixed_ips': [{'ip_address': ip_addr}],
'subnets': [{'cidr': str(ip_nw.cidr)}],
'subnets': [{'cidr': str(ip_nw.cidr),
'ip_version': ip_nw.version}],
'network': {'tags': [str(ip_nw.cidr)]}
},
'control_virtual_ip': {
'fixed_ips': [{'ip_address': ctlplane_vip_addr}],
'subnets': [{'cidr': str(ip_nw.cidr)}],
'subnets': [{'cidr': str(ip_nw.cidr),
'ip_version': ip_nw.version}],
'network': {'tags': [str(ip_nw.cidr)]}
},
'public_virtual_ip': {
'fixed_ips': [{'ip_address': public_vip_addr}],
'subnets': [{'cidr': str(ip_nw.cidr)}],
'subnets': [{'cidr': str(ip_nw.cidr),
'ip_version': ip_nw.version}],
'network': {'tags': [str(ip_nw.cidr)]}
}
}