Fix small misconfiguration in E/// templates
Related-bug: MOSSUST-111
Change-Id: I6e9061fc9ce2aa83d5ef38fcfee7717a1cf21675
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-environment.yaml b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-environment.yaml
index 820c2d5..1e2069f 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-environment.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-environment.yaml
@@ -8,8 +8,6 @@
interfaces:
ens3:
role: single_static_mgm
- ens4:
- role: single_static_ctl
# Physical nodes
kvm01.bm-e7-cicd-pike-ovs-maas.local:
@@ -20,9 +18,9 @@
interfaces:
one1:
role: single_mgm_dhcp
- ten2:
+ ten1:
role: bond_ctl_lacp
- sten2:
+ ten2:
role: bond_ctl_lacp
kvm02.bm-e7-cicd-pike-ovs-maas.local:
@@ -33,9 +31,9 @@
interfaces:
one1:
role: single_mgm_dhcp
- ten2:
+ ten1:
role: bond_ctl_lacp
- sten2:
+ ten2:
role: bond_ctl_lacp
kvm03.bm-e7-cicd-pike-ovs-maas.local:
@@ -46,9 +44,9 @@
interfaces:
one1:
role: single_mgm_dhcp
- ten2:
+ ten1:
role: bond_ctl_lacp
- sten2:
+ ten2:
role: bond_ctl_lacp
kvm04.bm-e7-cicd-pike-ovs-maas.local:
@@ -60,9 +58,9 @@
interfaces:
one1:
role: single_mgm_dhcp
- ten2:
+ ten1:
role: bond_ctl_lacp
- sten2:
+ ten2:
role: bond_ctl_lacp
kvm05.bm-e7-cicd-pike-ovs-maas.local:
@@ -74,24 +72,10 @@
interfaces:
one1:
role: single_mgm_dhcp
+ ten1:
+ role: bond_ctl_lacp
ten2:
role: bond_ctl_lacp
- sten2:
- role: bond_ctl_lacp
-
- kvm06.bm-e7-cicd-pike-ovs-maas.local:
- reclass_storage_name: infra_kvm_node06
- roles:
- - infra_kvm_wo_gluster
- - linux_system_codename_xenial
- - salt_master_host
- interfaces:
- one1:
- role: single_mgm_dhcp
- ten2:
- role: bond_ctl_lacp
- sten2:
- role: bond_ctl_lacp
cmp<<count>>:
reclass_storage_name: openstack_compute_rack01
@@ -104,11 +88,8 @@
ten1:
role: bond_ctl_lacp
ten2:
- role: bond_prv_lacp
- sten1:
role: bond_ctl_lacp
- sten2:
- role: bond_prv_lacp
+
gtw01.bm-e7-cicd-pike-ovs-maas.local:
reclass_storage_name: openstack_gateway_node01
@@ -121,9 +102,5 @@
ten1:
role: bond_ctl_lacp
ten2:
- role: bond_prv_lacp
- sten1:
role: bond_ctl_lacp
- sten2:
- role: bond_prv_lacp