UC/Standalone - Set ip_version in DeployedServerPortMap
Set ip_version property in the subnets section in DeployedServerPortMap set up in the environment for Undercloud and Standalone deployments. This will ensure that the NetIpVersionMapValue is populated properly, and puppet parameters like 'rabbit_ipv6' will be correctly populated for IPv6 undercloud deployment. Closes-Bug: #1947177 Change-Id: I60c8d845b0b0035364e19ac6aa8cad0bc9e614d3 (cherry picked from commite05b6083c2
) (cherry picked from commit293b843478
)
This commit is contained in:
parent
a191044457
commit
e47d2eec1b
|
@ -494,17 +494,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)]}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue