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/templates/cookied-cicd-bm-k8s-contrail40-maas/lab04-physical-inventory.yaml b/tcp_tests/templates/cookied-cicd-bm-k8s-contrail40-maas/lab04-physical-inventory.yaml
index d51f4b6..67b5df4 100644
--- a/tcp_tests/templates/cookied-cicd-bm-k8s-contrail40-maas/lab04-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-k8s-contrail40-maas/lab04-physical-inventory.yaml
@@ -18,11 +18,9 @@
       - linux_system_codename_xenial

       interfaces:

         enp9s0f0:

-          role: single_dhcp

+          role: single_mgm_dhcp

         enp9s0f1:

           role: single_vlan_ctl

-        ens11f0:

-          role: single_mgm_manual_vlan

 

     kvm02.cookied-cicd-bm-k8s-contrail40-maas.local:

       reclass_storage_name: infra_kvm_node02

@@ -31,11 +29,9 @@
       - linux_system_codename_xenial

       interfaces:

         enp9s0f0:

-          role: single_dhcp

+          role: single_mgm_dhcp

         enp9s0f1:

           role: single_vlan_ctl

-        ens11f0:

-          role: single_mgm_manual_vlan

 

     kvm03.cookied-cicd-bm-k8s-contrail40-maas.local:

       reclass_storage_name: infra_kvm_node03

@@ -44,11 +40,9 @@
       - linux_system_codename_xenial

       interfaces:

         enp9s0f0:

-          role: single_dhcp

+          role: single_mgm_dhcp

         enp9s0f1:

           role: single_vlan_ctl

-        ens11f0:

-          role: single_mgm_manual_vlan

 

     ctl01.cookied-cicd-bm-k8s-contrail40-maas.local:

       reclass_storage_name: kubernetes_control_node01

@@ -92,5 +86,7 @@
       interfaces:

         enp9s0f0:

           role: single_dhcp

+        enp9s0f1:

+          role: single_vlan_ctl

         ens11f1:

-          role: k8s_oc40_only_vhost_on_control_vlan

+          role: bond0_ab_contrail