]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
config: do not always set _osd_memory_target
authorGuillaume Abrioux <gabrioux@redhat.com>
Mon, 8 Aug 2022 05:43:54 +0000 (07:43 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Mon, 8 Aug 2022 11:01:48 +0000 (13:01 +0200)
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 <gabrioux@redhat.com>
(cherry picked from commit e2076e439b95bc695e1bc0764cbb8d7d5fc1fe4a)

roles/ceph-config/tasks/main.yml

index ab2bca7443fb85aacd4900d5f984aee60ffaea3d..28204aea02abf93abe4b73aa557279f3fb2ab335 100644 (file)
       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