From 17744256899089486b232280744002f02637c68a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Fri, 26 Oct 2018 04:55:46 +0200 Subject: [PATCH] Extend DeployedServerPortMap to include network props In I68e064d23ec5d43f59146d974cae604d2c5fdb52 we start using the 'tags' of the ctlplane network via get_attr on the ControlVirtualIP resource. The undercloud need to extend it's DeployedServerPortMap to provide the network tags. Related: blueprint tripleo-routed-networks-templates Change-Id: Ia8e219b30d4f8b199b882e95fe2834252a92c15a --- 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 83d5e3fcd..6c77d43ca 100644 --- a/tripleoclient/v1/tripleo_deploy.py +++ b/tripleoclient/v1/tripleo_deploy.py @@ -454,15 +454,18 @@ class Deploy(command.Command): 'DeployedServerPortMap': { ('%s-ctlplane' % hostname): { 'fixed_ips': [{'ip_address': ip_addr}], - 'subnets': [{'cidr': str(ip_nw)}] + 'subnets': [{'cidr': str(ip_nw)}], + 'network': {'tags': [str(ip_nw)]} }, 'control_virtual_ip': { 'fixed_ips': [{'ip_address': ctlplane_vip_addr}], - 'subnets': [{'cidr': str(ip_nw)}] + 'subnets': [{'cidr': str(ip_nw)}], + 'network': {'tags': [str(ip_nw)]} }, 'public_virtual_ip': { 'fixed_ips': [{'ip_address': public_vip_addr}], - 'subnets': [{'cidr': str(ip_nw)}] + 'subnets': [{'cidr': str(ip_nw)}], + 'network': {'tags': [str(ip_nw)]} } } }