From 89fe42bd5c124e056e03ca1b69a0549e8fab232d Mon Sep 17 00:00:00 2001
From: Brent Eagles <beagles@redhat.com>
Date: Wed, 24 Jun 2020 16:03:26 -0230
Subject: [PATCH] Set portmap cidr fields to extracted CIDR

Previously were just getting the address+mask which doesn't work well
for some uses.

Related-Bug: #1883692
Change-Id: Ia32acda4f22d99ada07291aaf52c97c676d13dd4
(cherry picked from commit 921bcef209626e9668a3de32ad526151e49a5d4d)
(cherry picked from commit 5e1475b5c8dba6a0056d147e86fc5dbd9f6ee1c8)
---
 tripleoclient/v1/tripleo_deploy.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tripleoclient/v1/tripleo_deploy.py b/tripleoclient/v1/tripleo_deploy.py
index 8936a8cac..2084e2bf7 100644
--- a/tripleoclient/v1/tripleo_deploy.py
+++ b/tripleoclient/v1/tripleo_deploy.py
@@ -494,18 +494,18 @@ class Deploy(command.Command):
             'DeployedServerPortMap': {
                 ('%s-ctlplane' % hostname): {
                     'fixed_ips': [{'ip_address': ip_addr}],
-                    'subnets': [{'cidr': str(ip_nw)}],
-                    'network': {'tags': [str(ip_nw)]}
+                    'subnets': [{'cidr': str(ip_nw.cidr)}],
+                    'network': {'tags': [str(ip_nw.cidr)]}
                 },
                 'control_virtual_ip': {
                     'fixed_ips': [{'ip_address': ctlplane_vip_addr}],
-                    'subnets': [{'cidr': str(ip_nw)}],
-                    'network': {'tags': [str(ip_nw)]}
+                    'subnets': [{'cidr': str(ip_nw.cidr)}],
+                    'network': {'tags': [str(ip_nw.cidr)]}
                 },
                 'public_virtual_ip': {
                     'fixed_ips': [{'ip_address': public_vip_addr}],
-                    'subnets': [{'cidr': str(ip_nw)}],
-                    'network': {'tags': [str(ip_nw)]}
+                    'subnets': [{'cidr': str(ip_nw.cidr)}],
+                    'network': {'tags': [str(ip_nw.cidr)]}
                 }
             }
         }