Add cinder volumes for OSD nodes
PROD:PROD-35107
Change-Id: I0784192cc62a8f015b9bd6ce361ec70531d0cf0c
diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index 4c27d97..6453453 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -45,15 +45,15 @@
ceph_mon_node03_hostname: cmn03
# Apply settings from context contexts/ceph/luminous-encrypted-devices.yml
ceph_osd_backend: bluestore
- ceph_osds_per_device: '1'
- ceph_osd_data_size: ''
+ ceph_osds_per_device: '3'
+ ceph_osd_data_size: '14'
ceph_osd_block_db_size: '3'
- ceph_osd_dmcrypt: True
+ ceph_osd_dmcrypt: False
ceph_osd_bond_mode: active-backup
ceph_osd_data_partition_prefix: ""
ceph_osd_count: '3'
- ceph_osd_data_disks: "/dev/vdb"
- ceph_osd_journal_or_block_db_disks: ""
+ ceph_osd_data_disks: "/dev/vdd"
+ ceph_osd_journal_or_block_db_disks: "/dev/vde"
ceph_osd_node_count: '3'
ceph_osd_journal_size: '3'
ceph_osd_deploy_nic: "eth0"
diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay.hot b/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay.hot
index 2003c57..d8359d9 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay.hot
@@ -806,7 +806,7 @@
instance_config_host: { get_attr: [cfg01_node, instance_address] }
ceph_osd_cluster:
- type: MCP::MultipleInstance
+ type: MCP::MultipleInstance2Volumes
depends_on: [cfg01_node]
properties:
env_name: { get_param: env_name }