Change iface names
Change-Id: I3c2d332c7267827b51028d3992967775fa87a5ee
diff --git a/tcp_tests/templates/cookied-cicd-bm-os-contrail32-released/lab04-physical-inventory.yaml b/tcp_tests/templates/cookied-cicd-bm-os-contrail32-released/lab04-physical-inventory.yaml
index 795c1f8..c9b633d 100644
--- a/tcp_tests/templates/cookied-cicd-bm-os-contrail32-released/lab04-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-os-contrail32-released/lab04-physical-inventory.yaml
@@ -1,5 +1,5 @@
nodes:
- cfg01.cookied-cicd-bm-os-contrail32-released.local:
+ cfg01.cookied-cicd-bm-os-contrail40-maas.local:
reclass_storage_name: infra_config_node01
roles:
- infra_config
@@ -11,43 +11,43 @@
role: single_static_ctl
# Physical nodes
- kvm01.cookied-cicd-bm-os-contrail32-released.local:
+ kvm01.cookied-cicd-bm-os-contrail40-maas.local:
reclass_storage_name: infra_kvm_node01
roles:
- infra_kvm
- linux_system_codename_xenial
interfaces:
- one1:
+ enp9s0f0:
role: single_dhcp
- one2:
+ enp9s0f1:
role: bond0_ab_ovs_vlan_ctl
- ten1:
+ ens11f0:
role: single_mgm_manual
- kvm02.cookied-cicd-bm-os-contrail32-released.local:
+ kvm02.cookied-cicd-bm-os-contrail40-maas.local:
reclass_storage_name: infra_kvm_node02
roles:
- infra_kvm
- linux_system_codename_xenial
interfaces:
- one1:
+ enp9s0f0:
role: single_dhcp
- one2:
+ enp9s0f1:
role: bond0_ab_ovs_vlan_ctl
- ten1:
+ ens11f0:
role: single_mgm_manual
- kvm03.cookied-cicd-bm-os-contrail32-released.local:
+ kvm03.cookied-cicd-bm-os-contrail40-maas.local:
reclass_storage_name: infra_kvm_node03
roles:
- infra_kvm
- linux_system_codename_xenial
interfaces:
- one1:
+ enp9s0f0:
role: single_dhcp
- one2:
+ enp9s0f1:
role: bond0_ab_ovs_vlan_ctl
- ten1:
+ ens11f0:
role: single_mgm_manual
osd<<count>>:
@@ -56,9 +56,9 @@
- ceph_osd
- linux_system_codename_xenial
interfaces:
- one1:
+ enp2s0f0:
role: single_dhcp
- one2:
+ enp2s0f1:
role: single_vlan_ctl
# role: bond0_ab_vlan_ceph_storage_backend
@@ -68,10 +68,9 @@
- openstack_compute
- linux_system_codename_xenial
interfaces:
- #one1: unused
- one2:
+ enp2s0f1:
role: single_dhcp
- ten1:
+ enp5s0f0:
role: bond0_ab_contrail
- ten2:
- role: single_vlan_ctl
+ enp5s0f1:
+ role: single_vlan_ctl
\ No newline at end of file
diff --git a/tcp_tests/templates/cookied-cicd-bm-os-contrail32-released/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/cookied-cicd-bm-os-contrail32-released/salt-context-cookiecutter-contrail.yaml
index ea868f5..3b285cc 100644
--- a/tcp_tests/templates/cookied-cicd-bm-os-contrail32-released/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-os-contrail32-released/salt-context-cookiecutter-contrail.yaml
@@ -129,11 +129,11 @@
# pxe_interface_mac:
pxe_interface_mac: "0c:c4:7a:6c:83:56"
interfaces:
- one1:
+ enp9s0f0:
mac: "0c:c4:7a:6c:83:56"
mode: "static"
ip: "172.16.49.67"
- subnet: "172.16.49.64/26" # create it manually... in UI
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
power_parameters:
power_address: "5.43.225.117"
@@ -145,11 +145,11 @@
# hwe_kernel: "hwe-16.04"
pxe_interface_mac: "0c:c4:7a:6c:84:2c"
interfaces:
- one1:
+ enp9s0f0:
mac: "0c:c4:7a:6c:84:2c"
mode: "static"
ip: "172.16.49.68"
- subnet: "172.16.49.64/26" # create it manually... in UI
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
power_parameters:
power_address: "5.43.225.118"
@@ -161,11 +161,11 @@
# hwe_kernel: "hwe-16.04"
pxe_interface_mac: "0c:c4:7a:6c:83:54"
interfaces:
- one1:
+ enp9s0f0:
mac: "0c:c4:7a:6c:83:54"
mode: "static"
ip: "172.16.49.69"
- subnet: "172.16.49.64/26" # create it manually... in UI
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
power_parameters:
power_address: "5.43.225.119"
@@ -177,11 +177,11 @@
# hwe_kernel: "hwe-16.04"
pxe_interface_mac: "0c:c4:7a:55:6a:d4"
interfaces:
- one1:
+ enp2s0f0:
mac: "0c:c4:7a:55:6a:d4"
mode: "static"
ip: "172.16.49.70"
- subnet: "172.16.49.64/26" # create it manually... in UI
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
power_parameters:
power_address: "185.8.59.243"
@@ -191,13 +191,13 @@
osd002: # #cz7343-kvm.host-telecom.com
distro_series: "xenial"
# hwe_kernel: "hwe-16.04"
- pxe_interface_mac: "0c:c4:7a:55:6a:57"
+ pxe_interface_mac: "0c:c4:7a:55:6a:56"
interfaces:
- one1:
- mac: "0c:c4:7a:55:6a:57"
+ enp2s0f0:
+ mac: "0c:c4:7a:55:6a:56"
mode: "static"
ip: "172.16.49.71"
- subnet: "172.16.49.64/26" # create it manually... in UI
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
power_parameters:
power_address: "185.8.59.244"
@@ -209,11 +209,11 @@
# hwe_kernel: "hwe-16.04"
pxe_interface_mac: "0c:c4:7a:55:6a:2a"
interfaces:
- one1:
+ enp2s0f0:
mac: "0c:c4:7a:55:6a:2a"
mode: "static"
ip: "172.16.49.72"
- subnet: "172.16.49.64/26" # create it manually... in UI
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
power_parameters:
power_address: "185.8.59.245"
@@ -225,11 +225,11 @@
# hwe_kernel: "hwe-16.04"
pxe_interface_mac: "0c:c4:7a:54:a2:5f"
interfaces:
- one2:
+ enp2s0f1:
mac: "0c:c4:7a:54:a2:5f"
mode: "static"
ip: "172.16.49.73"
- subnet: "172.16.49.64/26" # create it manually... in UI
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
power_parameters:
power_address: "185.8.59.233"
@@ -241,11 +241,11 @@
# hwe_kernel: "hwe-16.04"
pxe_interface_mac: "0c:c4:7a:54:a0:51"
interfaces:
- one2:
+ enp2s0f1:
mac: "0c:c4:7a:54:a0:51"
mode: "static"
ip: "172.16.49.74"
- subnet: "172.16.49.64/26" # create it manually... in UI
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
power_parameters:
power_address: "185.8.59.232"