From: Sébastien Han Date: Tue, 9 Jan 2018 12:54:50 +0000 (+0100) Subject: mon: use crush rules for non-container too X-Git-Tag: v3.0.17~9 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7390342ae46fbb0f8da79288a568166a53c820e3;p=ceph-ansible.git 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 (cherry picked from commit f0787e64da45fdbefb2ff1376a0705fadf6a502d) Signed-off-by: Sébastien Han --- diff --git a/roles/ceph-mon/tasks/ceph_keys.yml b/roles/ceph-mon/tasks/ceph_keys.yml index 29d9fb3c5..29eed9b7c 100644 --- 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 36b74b7d1..a29b4117c 100644 --- 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: