]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
ceph-config: drop osd_memory_target from ceph_conf_overrides
authorSeena Fallah <seenafallah@gmail.com>
Mon, 22 May 2023 20:44:46 +0000 (22:44 +0200)
committerGuillaume Abrioux <gabrioux@ibm.com>
Thu, 1 Jun 2023 13:00:42 +0000 (15:00 +0200)
As it's always being set in ceph.conf template, it leads to having duplicated osd_memory_target keys in rendered ceph conf while defining one in ceph_conf_overrides.

Signed-off-by: Seena Fallah <seenafallah@gmail.com>
(cherry picked from commit f90d5d8b4c01b1f7e398bbdc59adcfc00d12ed19)

roles/ceph-config/tasks/main.yml

index 834448622fa5f3477e499d08f48d67f585537976..8e62369f7985dd87a80f3b09e3736ec9259df941 100644 (file)
         - "{{ ceph_conf_overrides.get('osd', {}).get('osd_memory_target', '') }}"
       when: item
 
+    - name: drop osd_memory_target from conf override
+      set_fact:
+        ceph_conf_overrides: "{{ ceph_conf_overrides | combine({'osd': {item: omit}}, recursive=true) }}"
+      loop:
+        - osd memory target
+        - 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 }}"