commit a6167bb8a11df5ad022388888b94d88e2d78b8b6
author Hanna Arhipova <harhipova@mirantis.com> Mon Apr 06 17:37:17 2020 +0300
committer Hanna Arhipova <harhipova@mirantis.com> Tue Apr 07 20:38:32 2020 +0300
tree b40f8066e88d334e88c5cf317326b9c802076780
parent c61a0986becaf194bc457736b133e835265565b5

Add Ceph Nautilus for proposed deployments

Change-Id: I6af70cc918a935a331a6da3cb9f0873d58437717
related-prod: PROD-34912

tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml

diff --git a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
index cc98b5f..5724200 100644
--- a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
@@ -833,9 +833,9 @@
   ceph_osd_journal_size: 20
   ceph_osd_bond_mode: "active-backup"
   ceph_osd_data_partition_prefix: ""
+  ceph_osd_block_partition_prefix: ""
 
   ceph_public_network_allocation: storage
-  ceph_public_network: "==IPV4_NET_CONTROL_PREFIX==.0/24"
   ceph_cluster_network: "==IPV4_NET_CONTROL_PREFIX==.0/24"
 
 # for 2018.11.0+
@@ -845,7 +845,7 @@
   ceph_osd_backend_address_ranges: "==IPV4_NET_TENANT_PREFIX==.200-==IPV4_NET_TENANT_PREFIX==.202"
 
   ceph_osd_data_disks: "/dev/sdb"
-  ceph_osd_journal_or_block_db_disks: "/dev/sdb"
+  ceph_osd_journal_or_block_db_disks: "/dev/sdc"
   ceph_osd_mode: "separated"
   ceph_osd_deploy_nic: "eth0"
   ceph_osd_primary_first_nic: "eth1"
@@ -876,6 +876,16 @@
   #ceph_rgw_node03_deploy_address: "172.16.48.78"
   ceph_rgw_node03_address: "==IPV4_NET_CONTROL_PREFIX==.78"
   ceph_rgw_node03_hostname: "rgw03"
+  # FIXME after deleting Ceph public network
+  ceph_public_network: "==IPV4_NET_CONTROL_PREFIX==.0/24"
+  ceph_mon_node01_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.66"
+  ceph_mon_node02_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.67"
+  ceph_mon_node03_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.68"
+  ceph_rgw_node01_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.76"
+  ceph_rgw_node02_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.77"
+  ceph_rgw_node03_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.78"
+  ceph_osd_ceph_public_address_ranges: "==IPV4_NET_CONTROL_PREFIX==.201-==IPV4_NET_CONTROL_PREFIX==.203"
+
   manila_enabled: 'False'
   designate_backend: powerdns
   designate_enabled: 'True'