From 2e09456468a4fa23de2f4a02169658a313431a84 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 8 Aug 2022 07:43:54 +0200 Subject: [PATCH] config: do not always set _osd_memory_target When 'osd_memory_target' is overridden in ceph_conf_overrides. The task that sets the fact `osd_memory_target` in the ceph-config role should be skipped. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2056675#c11 Signed-off-by: Guillaume Abrioux (cherry picked from commit e2076e439b95bc695e1bc0764cbb8d7d5fc1fe4a) --- roles/ceph-config/tasks/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml index ab2bca744..28204aea0 100644 --- a/roles/ceph-config/tasks/main.yml +++ b/roles/ceph-config/tasks/main.yml @@ -102,6 +102,8 @@ set_fact: _osd_memory_target: "{{ ((ansible_facts['memtotal_mb'] * 1048576 * safety_factor | float) / num_osds | float) | int }}" when: + - not ceph_conf_overrides.get('osd', {}).get('osd_memory_target') + - not ceph_conf_overrides.get('osd', {}).get('osd memory target') - num_osds | default(0) | int > 0 - ((ansible_facts['memtotal_mb'] * 1048576 * safety_factor | float) / num_osds | float) > osd_memory_target