From a6ae67dc9cb8fd84857a21b4f2f2da232dec8d14 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 9 Aug 2022 22:44:36 +0200 Subject: [PATCH] config: use osd_memory_target value from ceph_conf_overrides if defined otherwise it's impossible to override `osd_memory_target` via `ceph_conf_overrides`. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2056675 Signed-off-by: Guillaume Abrioux (cherry picked from commit f19dcb266ae6c6539e3ed613fdaa94fdde636b26) --- roles/ceph-config/tasks/main.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml index 968372310..ed7605624 100644 --- a/roles/ceph-config/tasks/main.yml +++ b/roles/ceph-config/tasks/main.yml @@ -98,12 +98,21 @@ when: - devices | default([]) | length > 0 + - name: set_fact _osd_memory_target + set_fact: + _osd_memory_target: "{{ item }}" + loop: + - "{{ ceph_conf_overrides.get('osd', {}).get('osd memory target', '') }}" + - "{{ ceph_conf_overrides.get('osd', {}).get('osd_memory_target', '') }}" + when: + - item + - item > osd_memory_target + - name: set_fact _osd_memory_target 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') + - _osd_memory_target is undefined - num_osds | default(0) | int > 0 - ((ansible_facts['memtotal_mb'] * 1048576 * safety_factor | float) / num_osds | float) > osd_memory_target -- 2.47.3