Add OC with queens and ocata
* OC 4.1 with Ocata
* OC 3.2 with Ocata and 2018.8.0 release
* OC 4.1 with Queens
* Fix backend and public ceph ip ranges
Change-Id: Ie0f14e6518b231f687a638d53f1fe6cf09253892
diff --git a/tcp_tests/templates/cookied-cicd-bm-ocata-contrail-maas/lab04-physical-inventory.yaml b/tcp_tests/templates/cookied-cicd-bm-ocata-contrail-maas/lab04-physical-inventory.yaml
new file mode 100644
index 0000000..ce0fa39
--- /dev/null
+++ b/tcp_tests/templates/cookied-cicd-bm-ocata-contrail-maas/lab04-physical-inventory.yaml
@@ -0,0 +1,76 @@
+nodes:
+ cfg01.cookied-cicd-bm-ocata-contrail-maas.local:
+ reclass_storage_name: infra_config_node01
+ roles:
+ - infra_config
+ - linux_system_codename_xenial
+ interfaces:
+ ens3:
+ role: single_static_mgm
+ ens4:
+ role: single_static_ctl
+ # Physical nodes
+
+ kvm01.cookied-cicd-bm-ocata-contrail-maas.local:
+ reclass_storage_name: infra_kvm_node01
+ roles:
+ - infra_kvm
+ - linux_system_codename_xenial
+ interfaces:
+ enp9s0f0:
+ role: single_dhcp
+ enp9s0f1:
+ role: bond0_ab_ovs_vlan_ctl
+ ens11f0:
+ role: single_mgm_manual
+
+ kvm02.cookied-cicd-bm-ocata-contrail-maas.local:
+ reclass_storage_name: infra_kvm_node02
+ roles:
+ - infra_kvm
+ - linux_system_codename_xenial
+ interfaces:
+ enp9s0f0:
+ role: single_dhcp
+ enp9s0f1:
+ role: bond0_ab_ovs_vlan_ctl
+ ens11f0:
+ role: single_mgm_manual
+
+ kvm03.cookied-cicd-bm-ocata-contrail-maas.local:
+ reclass_storage_name: infra_kvm_node03
+ roles:
+ - infra_kvm
+ - linux_system_codename_xenial
+ interfaces:
+ enp9s0f0:
+ role: single_dhcp
+ enp9s0f1:
+ role: bond0_ab_ovs_vlan_ctl
+ ens11f0:
+ role: single_mgm_manual
+
+ osd<<count>>:
+ reclass_storage_name: ceph_osd_rack01
+ roles:
+ - ceph_osd
+ - linux_system_codename_xenial
+ interfaces:
+ enp2s0f0:
+ role: single_dhcp
+ enp2s0f1:
+ role: single_vlan_ctl
+# role: bond0_ab_vlan_ceph_storage_backend
+
+ cmp<<count>>:
+ reclass_storage_name: openstack_compute_rack01
+ roles:
+ - openstack_compute
+ - linux_system_codename_xenial
+ interfaces:
+ enp2s0f1:
+ role: single_dhcp
+ enp5s0f0:
+ role: bond0_ab_contrail
+ enp5s0f1:
+ role: single_vlan_ctl