Merge "UC/Standalone - Set ip_version in DeployedServerPortMap" into stable/wallaby
This commit is contained in:
commit
f004ede757
@ -433,17 +433,20 @@ class Deploy(command.Command):
|
|||||||
'DeployedServerPortMap': {
|
'DeployedServerPortMap': {
|
||||||
('%s-ctlplane' % hostname): {
|
('%s-ctlplane' % hostname): {
|
||||||
'fixed_ips': [{'ip_address': ip_addr}],
|
'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)]}
|
'network': {'tags': [str(ip_nw.cidr)]}
|
||||||
},
|
},
|
||||||
'control_virtual_ip': {
|
'control_virtual_ip': {
|
||||||
'fixed_ips': [{'ip_address': ctlplane_vip_addr}],
|
'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)]}
|
'network': {'tags': [str(ip_nw.cidr)]}
|
||||||
},
|
},
|
||||||
'public_virtual_ip': {
|
'public_virtual_ip': {
|
||||||
'fixed_ips': [{'ip_address': public_vip_addr}],
|
'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)]}
|
'network': {'tags': [str(ip_nw.cidr)]}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user