Fix model and tempest runner
Change-Id: I71158c1568da7a02cf81bcce68ad6d05184a15b1
diff --git a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-lab03-environment.yaml b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-lab03-environment.yaml
index b645bf2..a1bd850 100644
--- a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-lab03-environment.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-lab03-environment.yaml
@@ -7,8 +7,6 @@
interfaces:
ens3:
role: single_dhcp
-# ens4:
-# role: single_vlan_ctl
# Physical nodes
kvm01.cookied-bm-mcp-dvr-vxlan.local:
@@ -57,11 +55,7 @@
role: bond0_ab_ovs_vxlan_ctl_mesh
single_address: ${_param:openstack_compute_node01_control_address}
tenant_address: ${_param:openstack_compute_node01_tenant_address}
-# enp5s0f0:
-# role: bond0_ab_ovs_vxlan_ctl_mesh
-# Which of enp5s0f1. enp5s0f2, enp5s0f3 is for floating?
-# ens6:
-# role: bond1_ab_ovs_floating
+
cmp002.cookied-bm-mcp-dvr-vxlan.local:
reclass_storage_name: openstack_compute_node02
@@ -76,11 +70,7 @@
role: bond0_ab_ovs_vxlan_ctl_mesh
single_address: ${_param:openstack_compute_node02_control_address}
tenant_address: ${_param:openstack_compute_node02_tenant_address}
-# enp5s0f2:
-# role: bond0_ab_ovs_vxlan_ctl_mesh
-# Which of eno2, enp5s0f1, enp5s0f3 is for floating?
-# ens6:
-# role: bond1_ab_ovs_floating
+
gtw01.cookied-bm-mcp-dvr-vxlan.local:
reclass_storage_name: openstack_gateway_node01