Set portmap cidr fields to extracted CIDR

Previously were just getting the address+mask which doesn't work well
for some uses.

Related-Bug: #1883692
Change-Id: Ia32acda4f22d99ada07291aaf52c97c676d13dd4
(cherry picked from commit 921bcef209)
This commit is contained in:
Brent Eagles 2020-06-24 16:03:26 -02:30
parent 39c270006d
commit 5e1475b5c8
1 changed files with 6 additions and 6 deletions

View File

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