Fix network for cicd-bm-k8s model
Latest changes:
Restore segregated networks config
Changes:
Fix k8s manager
Change valid interface for vhost
Segregation tenant and control nets
Fix prx nodes config
Change-Id: Ibec7fdb70fac37a6ac7361f4774f0250eceb28b3
diff --git a/tcp_tests/managers/k8smanager.py b/tcp_tests/managers/k8smanager.py
index 5b43254..759e716 100644
--- a/tcp_tests/managers/k8smanager.py
+++ b/tcp_tests/managers/k8smanager.py
@@ -105,10 +105,16 @@
return [self.__underlay.host_by_node_name(node_name=v)
for pillar in masters_fqdn for k, v in pillar.items()]
+ def get_masters_name(self):
+ """ Return list of kubernetes masters hosts fqdn """
+ masters_fqdn = self._salt.get_pillar(
+ tgt='I@kubernetes:master', pillar='linux:network:fqdn')
+ return [v for pillar in masters_fqdn for k, v in pillar.items()]
+
@property
def controller_name(self):
""" Return node name of controller node that used for all actions """
- names = [node['node_name'] for node in self.get_controllers()]
+ names = [node for node in self.get_masters_name()]
# we want to return same controller name every time
names.sort()
return names[0]