Fix baremetal models

Change-Id: Ica4cbc307b166e57b1a03d517510495816cc88fe
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 a70b9f3..c92c9b9 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
@@ -70,8 +70,8 @@
           role: single_mgm_dhcp
         enp9s0f1:
           role: bond0_ab_dvr_vxlan_ctl_mesh_floating
-          single_address: 10.167.4.105
-          tenant_address: 10.167.6.105
+          single_address: 10.167.4.106
+          tenant_address: 10.167.6.106
 
     gtw01.cookied-bm-mcp-dvr-vxlan.local:
       reclass_storage_name: openstack_gateway_node01
@@ -82,7 +82,8 @@
         enp2s0f0:
           role: single_mgm_dhcp
         enp2s0f1:
-          role: bond0_ab_dvr_vxlan_ctl_mesh_floating
+          role: bond0_ab_dvr_vxlan_ctl_mesh_external
+          ex_address: 172.17.42.4
 
     gtw02.cookied-bm-mcp-dvr-vxlan.local:
       reclass_storage_name: openstack_gateway_node02
@@ -93,4 +94,5 @@
         enp2s0f0:
           role: single_mgm_dhcp
         enp2s0f1:
-          role: bond0_ab_dvr_vxlan_ctl_mesh_floating
+          role: bond0_ab_dvr_vxlan_ctl_mesh_external
+          ex_address: 172.17.42.5