Skip to content

Commit

Permalink
Adjust the ROOK_CEPH_CONFIG_VALUES for 4.14, issue#8505 (#8506)
Browse files Browse the repository at this point in the history
Signed-off-by: suchita-g <[email protected]>
  • Loading branch information
suchita-g authored Sep 20, 2023
1 parent 57dc1a2 commit 0d44555
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
14 changes: 14 additions & 0 deletions ocs_ci/ocs/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -1949,6 +1949,20 @@
osd_memory_target_cgroup_limit_ratio = 0.8
"""

ROOK_CEPH_CONFIG_VALUES_414 = """
[global]
bdev_flock_retry = 20
mon_osd_full_ratio = .85
mon_osd_backfillfull_ratio = .8
mon_osd_nearfull_ratio = .75
mon_max_pg_per_osd = 600
mon_pg_warn_max_object_skew = 0
mon_data_avail_warn = 15
[osd]
osd_memory_target_cgroup_limit_ratio = 0.8
bluestore_prefer_deferred_size_hdd = 0
"""

CEPH_DEBUG_CONFIG_VALUES = """
[mon]
debug_mon = 20
Expand Down
4 changes: 3 additions & 1 deletion tests/manage/z_cluster/test_ceph_default_values_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,10 @@ def test_validate_ceph_config_values_in_rook_config_override(self):
stored_values = constants.ROOK_CEPH_CONFIG_VALUES_410.split("\n")
elif ocs_version == version.VERSION_4_11:
stored_values = constants.ROOK_CEPH_CONFIG_VALUES_411.split("\n")
elif ocs_version >= version.VERSION_4_12:
elif ocs_version == version.VERSION_4_12 or ocs_version == version.VERSION_4_13:
stored_values = constants.ROOK_CEPH_CONFIG_VALUES_412.split("\n")
elif ocs_version >= version.VERSION_4_14:
stored_values = constants.ROOK_CEPH_CONFIG_VALUES_414.split("\n")
else:
stored_values = constants.ROOK_CEPH_CONFIG_VALUES.split("\n")
log.info(f"OCS version is {ocs_version}")
Expand Down

0 comments on commit 0d44555

Please sign in to comment.