tests: enforce some parameters for ceph-volume tests suite

dnm

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index f20fb85b9b02f47610975a562b11ef722c707b72..18fac22d826ba06c191f68e929bdd4b2ff821732 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -550,6 +550,12 @@ dummy:
 #     rgw_zone: zone1
 #
 #ceph_conf_overrides: {}
+#ceph_conf_overrides_ceph_volume_tests:
+#  global:
+#    osd_pool_default_pg_num: 8
+#    osd_pool_default_size: 1
+#  osd:
+#    bluefs_buffered_io: false
 
 
 #############

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 39cbe5a517226b22a69ea63924cbfe98b33c92bd..50c1d069fe4135269f1164358f93f020bd49b4f4 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -550,6 +550,12 @@ ceph_iscsi_config_dev: false
 #     rgw_zone: zone1
 #
 #ceph_conf_overrides: {}
+#ceph_conf_overrides_ceph_volume_tests:
+#  global:
+#    osd_pool_default_pg_num: 8
+#    osd_pool_default_size: 1
+#  osd:
+#    bluefs_buffered_io: false
 
 
 #############

diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml
index 73262d10398583a269886db26fa4a46d415f66be..965800f140d62760f0b36187a58c942fa904783e 100644 (file)
--- a/roles/ceph-config/tasks/main.yml
+++ b/roles/ceph-config/tasks/main.yml
@@ -130,7 +130,7 @@
     owner: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}"
     group: "{{ ceph_uid if containerized_deployment | bool else 'ceph' }}"
     mode: "0644"
-    config_overrides: "{{ ceph_conf_overrides }}"
+    config_overrides: "{{ ceph_conf_overrides_ceph_volume_tests }}"
     config_type: ini
   notify:
     - restart ceph mons

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 1fe0d4019948c084ee89c4adf098e2effe6e937e..255095c00766959892bff1715b3bcc9a99f88f8a 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -542,6 +542,12 @@ rgw_zone: default
 #     rgw_zone: zone1
 #
 ceph_conf_overrides: {}
+ceph_conf_overrides_ceph_volume_tests:
+  global:
+    osd_pool_default_pg_num: 8
+    osd_pool_default_size: 1
+  osd:
+    bluefs_buffered_io: false
 
 
 #############