Modifying new cookied model for baremetal
Removing openstack_telemetry (mdb) nodes due to this merge
https://github.com/Mirantis/mk2x-cookiecutter-reclass-model/commit/6191e302eecaf62451415ec2eeea992b28d11f71
Hack virouter
reboot cmp
change cookiecutter-contex to another file (with dpdk)
Change stacklight VIP determining
Move cinder lvm to computes
Add workarounds for cinder backend
Change-Id: I9bfe68a91723563bbd1507d6468b8f4b9efe2861
diff --git a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/lab04-physical-inventory.yaml b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/lab04-physical-inventory.yaml
index 8234156..21b0703 100644
--- a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/lab04-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/lab04-physical-inventory.yaml
@@ -1,4 +1,12 @@
nodes:
+ cfg01.cookied-bm-mcp-ocata-contrail.local:
+ reclass_storage_name: infra_config_node01
+ roles:
+ - infra_config
+ - linux_system_codename_xenial
+ interfaces:
+ ens3:
+ role: single_dhcp
# Physical nodes
kvm01.cookied-bm-mcp-ocata-contrail.local:
@@ -37,34 +45,46 @@
cmp001.cookied-bm-mcp-ocata-contrail.local:
reclass_storage_name: openstack_compute_node01
roles:
- - openstack_compute
+ - openstack_compute_dpdk
+ - features_lvm_backend
- linux_system_codename_xenial
interfaces:
enp2s0f1:
- role: parametrized_interface
+ role: single_mgm
deploy_address: 172.16.49.72
- enp2s0f0:
- role: parametrized_interface
- single_address: 10.167.4.72
enp5s0f0:
- role: parametrized_interface
+ role: bond2_contrail_dpdk_prv
+ dpdk_pci: "'0000:05:00.0'"
+ dpdk_mac: '90:e2:ba:19:c2:18'
+ enp5s0f1:
+ role: bond0_ab_ctl_contrail
tenant_address: 192.168.0.101
+ single_address: 10.167.8.101
+ # enp5s0f1:
+ # role: single_vlan_ctl
+ # single_address: 10.167.8.101
cmp002.cookied-bm-mcp-ocata-contrail.local:
reclass_storage_name: openstack_compute_node02
roles:
- - openstack_compute
+ - openstack_compute_dpdk
+ - features_lvm_backend
- linux_system_codename_xenial
interfaces:
enp2s0f1:
- role: parametrized_interface
+ role: single_mgm
deploy_address: 172.16.49.74
- enp2s0f0:
- role: parametrized_interface
- single_address: 10.167.4.74
enp5s0f0:
- role: parametrized_interface
- tenant_address: 192.168.0.102
+ role: bond2_contrail_dpdk_prv
+ tenant_address: 192.168.0.101
+ dpdk_pci: "'0000:05:00.0'"
+ dpdk_mac: '00:1b:21:87:21:98'
+ enp5s0f1:
+ role: bond0_ab_ctl_contrail
+ single_address: 10.167.8.102
+ # enp5s0f1:
+ # role: single_vlan_ctl
+ # single_address: 10.167.8.102
# gtw01.cookied-bm-mcp-ocata-contrail.local:
# reclass_storage_name: openstack_gateway_node01