Add Ceph Nautilus for proposed deployments
Change-Id: I6af70cc918a935a331a6da3cb9f0873d58437717
related-prod: PROD-34912
diff --git a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
index 523e30e..84546ec 100644
--- a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
@@ -823,10 +823,15 @@
openldap_domain: heat-bm-cicd-queens-contrail-sl.local
openldap_enabled: 'True'
openldap_organisation: ${_param:cluster_name}
+ # Apply ceph setting from contexts/ceph/nautilus-multiple-osd.yml
ceph_enabled: 'True'
- ceph_version: "luminous"
+ ceph_version: "nautilus"
ceph_hyper_converged: "False"
ceph_osd_backend: "bluestore"
+ ceph_osds_per_device: '1'
+ ceph_osd_data_size: ''
+ ceph_osd_dmcrypt: False
+ ceph_osd_journal_partitoning: true
ceph_osd_count: "3"
ceph_osd_node_count: 3
ceph_osd_block_db_size: 20
@@ -835,8 +840,16 @@
ceph_osd_data_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"
+ # 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"
# for 2018.11.0+
ceph_osd_single_address_ranges: "==IPV4_NET_CONTROL_PREFIX==.200-==IPV4_NET_CONTROL_PREFIX==.202"
@@ -845,7 +858,8 @@
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_block_partition_prefix: ''
+ ceph_osd_journal_or_block_db_disks: "/dev/sdc"
ceph_osd_mode: "separated"
ceph_osd_deploy_nic: "eth0"
ceph_osd_primary_first_nic: "eth1"