Merge "Set portmap cidr fields to extracted CIDR" into stable/ussuri

This commit is contained in:
Zuul 2020-08-13 00:28:26 +00:00 committed by Gerrit Code Review
commit 2e51ac3c3d
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)]}
}
}
}