config: followup on 8a5628b51

Add missing `--cluster {{ cluster }}` on task
`set osd_memory_target` in the main.yml file of the
ceph-config role.
Also it moves the task after ceph configuration file is actually written.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 9f59c7286fcfcf1c15cb02c19f86a7ad91d4e4a3)

diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml
index fc06d925a4d784d7cffaeedadad7fb4e19bce08b..ab2bca7443fb85aacd4900d5f984aee60ffaea3d 100644 (file)
--- a/roles/ceph-config/tasks/main.yml
+++ b/roles/ceph-config/tasks/main.yml
@@ -105,11 +105,6 @@
         - num_osds | default(0) | int > 0
         - ((ansible_facts['memtotal_mb'] * 1048576 * safety_factor | float) / num_osds | float) > osd_memory_target
 
-    - name: set osd_memory_target
-      command: "{{ ceph_cmd }} config set osd/host:{{ inventory_hostname }} osd_memory_target {{ _osd_memory_target | default(osd_memory_target) }}"
-      changed_when: false
-      delegate_to: "{{ groups[mon_group_name][0] }}"
-
 - name: create ceph conf directory
   file:
     path: "/etc/ceph"

diff --git a/roles/ceph-osd/tasks/main.yml b/roles/ceph-osd/tasks/main.yml
index 185950553112e55e42a88ceb3ce84906fb8623b1..714b6e31eed95ee383b09147d953f03deb24b636 100644 (file)
--- a/roles/ceph-osd/tasks/main.yml
+++ b/roles/ceph-osd/tasks/main.yml
@@ -129,4 +129,9 @@
     - not rolling_update | default(False) | bool
     - openstack_config | bool
     - inventory_hostname == groups[osd_group_name] | last
-  tags: wait_all_osds_up
\ No newline at end of file
+  tags: wait_all_osds_up
+
+- name: set osd_memory_target
+  command: "{{ ceph_cmd }} --cluster {{ cluster }} config set osd/host:{{ inventory_hostname }} osd_memory_target {{ _osd_memory_target | default(osd_memory_target) }}"
+  changed_when: false
+  delegate_to: "{{ groups[mon_group_name][0] }}"