openstack/tripleo-common
Code Issues Proposed changes

Merge "Drop ctlplane from role_networks ansible var"

Browse Source
This commit is contained in:
Zuul 2022-08-24 02:50:10 +00:00 committed by Gerrit Code Review
commit 915ff9243c
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tripleo_common/inventory.py
View File

@ -624,7 +624,8 @@ class TripleoInventory(object):
sorted(role_networks))
role_vars.setdefault(
'role_networks',
[networks_upper[net] for net in role_networks])
[networks_upper[net] for net in role_networks
if net != self.host_network])
role_vars.setdefault('networks_all', networks_all)
role_vars.setdefault('networks_lower', networks_lower)

14
tripleo_common/tests/test_inventory.py
View File

@ -789,7 +789,7 @@ class TestInventory(base.TestCase):
'networks_all': ['InternalApi'],
'networks_lower': {'InternalApi': 'internal_api',
'ctlplane': 'ctlplane'},
'role_networks': ['ctlplane', 'InternalApi'],
'role_networks': ['InternalApi'],
'serial': 1,
'tripleo_role_name': 'Controller',
'tripleo_role_networks': ['ctlplane', 'internal_api']
@ -822,7 +822,7 @@ class TestInventory(base.TestCase):
'networks_all': ['InternalApi'],
'networks_lower': {'InternalApi': 'internal_api',
'ctlplane': 'ctlplane'},
'role_networks': ['ctlplane', 'InternalApi'],
'role_networks': ['InternalApi'],
'serial': 1,
'tripleo_role_name': 'Compute',
'tripleo_role_networks': ['ctlplane', 'internal_api']
@ -865,7 +865,7 @@ class TestInventory(base.TestCase):
'networks_all': ['InternalApi'],
'networks_lower': {'InternalApi': 'internal_api',
'ctlplane': 'ctlplane'},
'role_networks': ['ctlplane', 'InternalApi'],
'role_networks': ['InternalApi'],
'serial': 1,
'tripleo_role_name': 'Controller',
'tripleo_role_networks': ['ctlplane', 'internal_api']
@ -891,7 +891,7 @@ class TestInventory(base.TestCase):
'networks_all': ['InternalApi'],
'networks_lower': {'InternalApi': 'internal_api',
'ctlplane': 'ctlplane'},
'role_networks': ['ctlplane', 'InternalApi'],
'role_networks': ['InternalApi'],
'serial': 1,
'tripleo_role_name': 'Compute',
'tripleo_role_networks': ['ctlplane', 'internal_api']
@ -1019,7 +1019,7 @@ class TestInventory(base.TestCase):
'networks_all': ['InternalApi'],
'networks_lower': {'InternalApi': 'internal_api',
'ctlplane': 'ctlplane'},
'role_networks': ['ctlplane', 'InternalApi'],
'role_networks': ['InternalApi'],
'serial': 1,
'tripleo_role_name': 'Controller',
'tripleo_role_networks': ['ctlplane', 'internal_api']}
@ -1055,7 +1055,7 @@ class TestInventory(base.TestCase):
'networks_all': ['InternalApi'],
'networks_lower': {'InternalApi': 'internal_api',
'ctlplane': 'ctlplane'},
'role_networks': ['ctlplane', 'InternalApi'],
'role_networks': ['InternalApi'],
'serial': 1,
'tripleo_role_name': 'Compute',
'tripleo_role_networks': ['ctlplane', 'internal_api']}
@ -1083,7 +1083,7 @@ class TestInventory(base.TestCase):
'networks_all': ['InternalApi'],
'networks_lower': {'InternalApi': 'internal_api',
'ctlplane': 'ctlplane'},
'role_networks': ['ctlplane'],
'role_networks': [],
'serial': 1,
'tripleo_role_name': 'CustomRole',
'tripleo_role_networks': ['ctlplane']}