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-os-contrail40-maas/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-cookiecutter-contrail.yaml
index 8446f86..efcfc73 100644
--- a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-cookiecutter-contrail.yaml
@@ -69,8 +69,8 @@
cicd_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4ELbbhdBkXLOoLnoTJLvKv+uWlFFiyva+OLvt9qhZAWaBhtmh7Kqqqbx5I3QJzTACfFaxDsfdk325OfJZWuyiCzW/Hzn3uKitkBPgy7okNuRaVmEhQej0/2K1Yl1RanGMNq+oi+Nmj4OY47WZ+/0rVqw/wI5qdASyAdLK5/5cowGDSSiQRqaYBS1L0dHEIAnjtCAs9IIWKPmKH8xFZjcdYVQUQXeBF1Sh1aZ4k2Zb7skftPbAh3WSfyhHJrt5p0rF3rARoIabkgtfDBUWYWQ4aUR4LzAeduRq138DncPHNR84cGLbsZp/zcM/EqoNZbRoCHtvj0ScWF2S4XdnJdtj
cluster_domain: cookied-bm-4.0-contrail.local
cluster_name: cookied-bm-4.0-contrail
- opencontrail_version: 4.0
- linux_repo_contrail_component: oc40
+ opencontrail_version: 4.1
+ linux_repo_contrail_component: oc41
compute_bond_mode: active-backup
compute_padding_with_zeros: 'True'
compute_primary_first_nic: eth1
@@ -396,9 +396,10 @@
ceph_cluster_network: "10.167.8.0/24"
# for 2018.11.0+
+ ceph_osd_single_address_ranges: "10.167.8.200-10.167.8.202"
ceph_osd_deploy_address_ranges: "172.16.49.70-172.16.49.72"
- ceph_osd_storage_address_ranges: "10.167.47.200-10.167.47.202"
- ceph_osd_backend_address_ranges: "10.167.49.200-10.167.49.202"
+ ceph_osd_storage_address_ranges: "10.167.8.200-10.167.8.202"
+ ceph_osd_backend_address_ranges: "10.167.10.200-10.167.10.202"
ceph_osd_data_disks: "/dev/sdb"
ceph_osd_journal_or_block_db_disks: "/dev/sdb"