From a8fe484e1533db760b35fd948a30cc7fd512df2f Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 16 Aug 2022 09:43:50 +0200 Subject: [PATCH] ceph-config: allow overriding osd_memory_target If `osd_memory_target` is set in group_vars, the default value (4Gb) should be overridden. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2118544 Signed-off-by: Guillaume Abrioux (cherry picked from commit 03713070eb481029d4493db0a565a9e753f059c9) --- roles/ceph-config/tasks/main.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml index 6052d645b..24171d28a 100644 --- a/roles/ceph-config/tasks/main.yml +++ b/roles/ceph-config/tasks/main.yml @@ -98,23 +98,20 @@ when: - devices | default([]) | length > 0 - - name: set_fact _osd_memory_target + - name: set_fact osd_memory_target, override from ceph_conf_overrides set_fact: - _osd_memory_target: "{{ item }}" + 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 + when: item - name: set_fact _osd_memory_target set_fact: _osd_memory_target: "{{ ((ansible_facts['memtotal_mb'] * 1048576 * safety_factor | float) / num_osds | float) | int }}" when: - - _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 + - ((ansible_facts['memtotal_mb'] * 1048576 * safety_factor | float) / num_osds | float) > (osd_memory_target | float) - name: create ceph conf directory file: -- 2.47.3