mon: use crush rules for non-container too

There is no reasons why we can't use crush rules when deploying
containers. So moving the inlcude in the main.yml so it can be called.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit f0787e64da45fdbefb2ff1376a0705fadf6a502d)
Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/roles/ceph-mon/tasks/ceph_keys.yml b/roles/ceph-mon/tasks/ceph_keys.yml
index 29d9fb3c5b1f2e32bfb2b9d4ba2e80a00f6793d7..29eed9b7c2d4e1d54091cb77a5f847ab774d48eb 100644 (file)
--- a/roles/ceph-mon/tasks/ceph_keys.yml
+++ b/roles/ceph-mon/tasks/ceph_keys.yml
@@ -76,11 +76,6 @@
     - ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel
   with_items: "{{ groups.get(mgr_group_name, []) }}"
 
-- name: crush_rules.yml
-  include: crush_rules.yml
-  when:
-    - crush_rule_config
-
 - name: find ceph keys
   shell: ls -1 /etc/ceph/*.keyring
   changed_when: false

diff --git a/roles/ceph-mon/tasks/main.yml b/roles/ceph-mon/tasks/main.yml
index 36b74b7d1b388095a1c694da54c75d4de6b5bd50..a29b4117cce31965a04e73bdd177fdc948913541 100644 (file)
--- a/roles/ceph-mon/tasks/main.yml
+++ b/roles/ceph-mon/tasks/main.yml
@@ -22,6 +22,11 @@
   # this avoids the bug mentioned here: https://github.com/ansible/ansible/issues/18206
   static: no
 
+- name: crush_rules.yml
+  include: crush_rules.yml
+  when:
+    - crush_rule_config
+
 - name: include secure_cluster.yml
   include: secure_cluster.yml
   when: