From 293b843478b4ed9ecbfb3fa6d46d5ac3e051bb2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Thu, 14 Oct 2021 17:34:46 +0200 Subject: [PATCH] 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 commit e05b6083c211fcf9a9b636ac3dfc5c1565e77cb4) --- tripleoclient/v1/tripleo_deploy.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tripleoclient/v1/tripleo_deploy.py b/tripleoclient/v1/tripleo_deploy.py index 065b8c2d1..79076b922 100644 --- a/tripleoclient/v1/tripleo_deploy.py +++ b/tripleoclient/v1/tripleo_deploy.py @@ -433,17 +433,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)]} } }