openstack
/
python-tripleoclient
Code Issues Proposed changes

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
This commit is contained in:
Harald Jensås 2021-10-14 17:34:46 +02:00
parent 88cfe404b5
commit e05b6083c2
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tripleoclient/v1/tripleo_deploy.py
View File

@ -431,17 +431,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)]}
} }
} }