Update model
Update model for new servers
Change-Id: I65f37388a18b614e1cdd6154fd58e5cb6bb32aed
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 b5e831d..b645bf2 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
@@ -17,9 +17,9 @@
- infra_kvm
- linux_system_codename_xenial
interfaces:
- enp2s0f0:
+ enp9s0f0:
role: single_mgm_dhcp
- enp2s0f1:
+ enp9s0f1:
role: bond0_ab_ovs_vlan_ctl
kvm02.cookied-bm-mcp-dvr-vxlan.local:
@@ -28,9 +28,9 @@
- infra_kvm
- linux_system_codename_xenial
interfaces:
- enp2s0f0:
+ enp9s0f0:
role: single_mgm_dhcp
- enp2s0f1:
+ enp9s0f1:
role: bond0_ab_ovs_vlan_ctl
kvm03.cookied-bm-mcp-dvr-vxlan.local:
@@ -39,26 +39,26 @@
- infra_kvm
- linux_system_codename_xenial
interfaces:
- eno1:
+ enp9s0f0:
role: single_mgm_dhcp
- eno2:
+ enp9s0f1:
role: bond0_ab_ovs_vlan_ctl
cmp001.cookied-bm-mcp-dvr-vxlan.local:
reclass_storage_name: openstack_compute_node01
roles:
- openstack_compute
-# - features_lvm_backend
+ - features_lvm_backend
- linux_system_codename_xenial
interfaces:
- enp3s0f0:
+ enp9s0f0:
role: single_dhcp
- enp3s0f1:
+ enp9s0f1:
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
+# enp5s0f0:
+# role: bond0_ab_ovs_vxlan_ctl_mesh
# Which of enp5s0f1. enp5s0f2, enp5s0f3 is for floating?
# ens6:
# role: bond1_ab_ovs_floating
@@ -70,14 +70,14 @@
- features_lvm_backend
- linux_system_codename_xenial
interfaces:
- eno1:
+ enp9s0f0:
role: single_dhcp
- enp5s0f0:
+ enp9s0f1:
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
+# enp5s0f2:
+# role: bond0_ab_ovs_vxlan_ctl_mesh
# Which of eno2, enp5s0f1, enp5s0f3 is for floating?
# ens6:
# role: bond1_ab_ovs_floating
@@ -88,18 +88,18 @@
- openstack_gateway
- linux_system_codename_xenial
interfaces:
- enp3s0f0:
+ enp2s0f0:
role: single_dhcp
- enp3s0f1:
+ enp2s0f1:
role: bond0_ab_dvr_vxlan_ctl_mesh_floating
- #gtw02.cookied-bm-mcp-dvr-vxlan.local:
- # reclass_storage_name: openstack_gateway_node02
- # roles:
- # - openstack_gateway
- # - linux_system_codename_xenial
- # interfaces:
- # eno1:
- # role: single_dhcp
- # eno2:
- # role: bond0_ab_dvr_vxlan_ctl_mesh_floating
+ gtw02.cookied-bm-mcp-dvr-vxlan.local:
+ reclass_storage_name: openstack_gateway_node02
+ roles:
+ - openstack_gateway
+ - linux_system_codename_xenial
+ interfaces:
+ enp2s0f0:
+ role: single_dhcp
+ enp2s0f1:
+ role: bond0_ab_dvr_vxlan_ctl_mesh_floating