ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
pull/2317/head
Sébastien Han 2018-01-09 13:54:50 +01:00 committed by Guillaume Abrioux
parent 97f520bc74
commit f0787e64da
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
roles/ceph-mon/tasks/ceph_keys.yml
View File

@ -76,11 +76,6 @@
- ceph_release_num[ceph_release] > ceph_release_num.jewel - ceph_release_num[ceph_release] > ceph_release_num.jewel
with_items: "{{ groups.get(mgr_group_name, []) }}" with_items: "{{ groups.get(mgr_group_name, []) }}"
- name: crush_rules.yml
include: crush_rules.yml
when:
- crush_rule_config
- name: find ceph keys - name: find ceph keys
shell: ls -1 /etc/ceph/*.keyring shell: ls -1 /etc/ceph/*.keyring
changed_when: false changed_when: false

5
roles/ceph-mon/tasks/main.yml
View File

@ -22,6 +22,11 @@
# this avoids the bug mentioned here: https://github.com/ansible/ansible/issues/18206 # this avoids the bug mentioned here: https://github.com/ansible/ansible/issues/18206
static: no static: no
- name: crush_rules.yml
include: crush_rules.yml
when:
- crush_rule_config
- name: include secure_cluster.yml - name: include secure_cluster.yml
include: secure_cluster.yml include: secure_cluster.yml
when: when: