From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Tue, 9 Aug 2022 20:44:36 +0000 (+0200)
Subject: config: use osd_memory_target value from ceph_conf_overrides if defined
X-Git-Tag: v6.0.28~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=84a81a139fd718079dad1d42efcb4a721cad7d1e;p=ceph-ansible.git

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 <gabrioux@redhat.com>
(cherry picked from commit f19dcb266ae6c6539e3ed613fdaa94fdde636b26)
---

diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml
index 28204aea0..6052d645b 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