Update dvr-vxlan
Change-Id: I03efe2ff335c7c7673af543117090786399489a8
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 a1bd850..a70b9f3 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,6 +7,8 @@
interfaces:
ens3:
role: single_dhcp
+ ens4:
+ role: single_static_ctl
# Physical nodes
kvm01.cookied-bm-mcp-dvr-vxlan.local:
@@ -42,7 +44,7 @@
enp9s0f1:
role: bond0_ab_ovs_vlan_ctl
- cmp001.cookied-bm-mcp-dvr-vxlan.local:
+ cmp01.cookied-bm-mcp-dvr-vxlan.local:
reclass_storage_name: openstack_compute_node01
roles:
- openstack_compute
@@ -50,14 +52,14 @@
- linux_system_codename_xenial
interfaces:
enp9s0f0:
- role: single_dhcp
+ role: single_mgm_dhcp
enp9s0f1:
- role: bond0_ab_ovs_vxlan_ctl_mesh
- single_address: ${_param:openstack_compute_node01_control_address}
- tenant_address: ${_param:openstack_compute_node01_tenant_address}
+ role: bond0_ab_dvr_vxlan_ctl_mesh_floating
+ single_address: 10.167.4.105
+ tenant_address: 10.167.6.105
- cmp002.cookied-bm-mcp-dvr-vxlan.local:
+ cmp02.cookied-bm-mcp-dvr-vxlan.local:
reclass_storage_name: openstack_compute_node02
roles:
- openstack_compute
@@ -65,12 +67,11 @@
- linux_system_codename_xenial
interfaces:
enp9s0f0:
- role: single_dhcp
+ role: single_mgm_dhcp
enp9s0f1:
- role: bond0_ab_ovs_vxlan_ctl_mesh
- single_address: ${_param:openstack_compute_node02_control_address}
- tenant_address: ${_param:openstack_compute_node02_tenant_address}
-
+ role: bond0_ab_dvr_vxlan_ctl_mesh_floating
+ single_address: 10.167.4.105
+ tenant_address: 10.167.6.105
gtw01.cookied-bm-mcp-dvr-vxlan.local:
reclass_storage_name: openstack_gateway_node01
@@ -79,7 +80,7 @@
- linux_system_codename_xenial
interfaces:
enp2s0f0:
- role: single_dhcp
+ role: single_mgm_dhcp
enp2s0f1:
role: bond0_ab_dvr_vxlan_ctl_mesh_floating
@@ -90,6 +91,6 @@
- linux_system_codename_xenial
interfaces:
enp2s0f0:
- role: single_dhcp
+ role: single_mgm_dhcp
enp2s0f1:
role: bond0_ab_dvr_vxlan_ctl_mesh_floating