Revert "Fix network for cicd-bm-k8s model"
This reverts commit bef60d90a51245a883831f4312ed6414874dc317.
Change-Id: Icbe1a770b3270a332d94592ec66cb4493b2afc4e
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 67b5df4..d51f4b6 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,9 +18,11 @@
- linux_system_codename_xenial
interfaces:
enp9s0f0:
- role: single_mgm_dhcp
+ role: single_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
@@ -29,9 +31,11 @@
- linux_system_codename_xenial
interfaces:
enp9s0f0:
- role: single_mgm_dhcp
+ role: single_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
@@ -40,9 +44,11 @@
- linux_system_codename_xenial
interfaces:
enp9s0f0:
- role: single_mgm_dhcp
+ role: single_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
@@ -86,7 +92,5 @@
interfaces:
enp9s0f0:
role: single_dhcp
- enp9s0f1:
- role: single_vlan_ctl
ens11f1:
- role: bond0_ab_contrail
+ role: k8s_oc40_only_vhost_on_control_vlan