From e25e523dfb24bdc2e466aecb94cb5e3b14f0dbd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Harald=20Jens=C3=A5s?= <hjensas@redhat.com>
Date: Wed, 19 May 2021 15:53:03 +0200
Subject: [PATCH] Ignore non host ports by tag filtering

Don't include tripleo_vip_net and tripleo_service_vip
ports when generating the inventory.

Closes-Bug: #1928469
Change-Id: I3db93dd6aa493da6f1c059b1c49eb0fa0f3179fc
(cherry picked from commit 0a35f94522b93fde032a439eaa57fab0e7ee7ccf)
---
 tripleo_common/inventory.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tripleo_common/inventory.py b/tripleo_common/inventory.py
index 104961467..2fc566df6 100644
--- a/tripleo_common/inventory.py
+++ b/tripleo_common/inventory.py
@@ -129,6 +129,7 @@ class NeutronData(object):
 
     def _ports_by_role_and_host(self):
         mandatory_tags = {'tripleo_role'}
+        ignore_tags = {'tripleo_vip_net', 'tripleo_service_vip'}
 
         ports_by_role_and_host = {}
         for port in self.ports:
@@ -137,6 +138,10 @@ class NeutronData(object):
                 continue
 
             tags = self._tags_to_dict(port.tags)
+            # Ignore non host ports by looking for the tags
+            if ignore_tags.intersection(tags):
+                continue
+
             # In case of missing required tags, raise an error.
             # neutron is useless as a inventory source in this case.
             if not mandatory_tags.issubset(tags):