Merge "Mark testresults automatically for each deployment"
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 46c1b7e..bc5cf98 100644
--- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -775,6 +775,11 @@
   ceph_version: "nautilus"
   ceph_hyper_converged: "False"
   rbd_monitoring_enabled: 'True'
+  rbd_pool_stats_gnocchi: 'True'
+  rbd_pool_stats_volumes: 'True'
+  rbd_pool_stats_images: 'True'
+  rbd_pool_stats_backups: 'True'
+  rbd_pool_stats_vms : 'True'
   # Apply settings for ceph from contexts/ceph/nautilus-collocated-block-db.yml
   ceph_osd_backend: "bluestore"
   ceph_osds_per_device: '1'
diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
index 4d93719..378fde9 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -45,6 +45,11 @@
   ceph_mon_node03_address: 10.167.4.68
   ceph_mon_node03_hostname: cmn03
   rbd_monitoring_enabled: 'True'
+  rbd_pool_stats_gnocchi: 'True'
+  rbd_pool_stats_volumes: 'True'
+  rbd_pool_stats_images: 'True'
+  rbd_pool_stats_backups: 'True'
+  rbd_pool_stats_vms : 'True'
   # Apply changes for ceph from contexts/ceph/nautilus-encrypted-devices.yml
   ceph_osd_backend: bluestore
   ceph_osds_per_device: '3'
diff --git a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
index 3c39011..fbd6da5 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -45,6 +45,11 @@
   ceph_mon_node03_address: 10.167.4.68
   ceph_mon_node03_hostname: cmn03
   rbd_monitoring_enabled: 'True'
+  rbd_pool_stats_gnocchi: 'True'
+  rbd_pool_stats_volumes: 'True'
+  rbd_pool_stats_images: 'True'
+  rbd_pool_stats_backups: 'True'
+  rbd_pool_stats_vms : 'True'
     # Apply changes for ceph from contexts/ceph/nautilus-encrypted-devices.yml
   ceph_osd_backend: bluestore
   ceph_osds_per_device: '3'