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