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

Merge pull request #1305 from guits/quick_fix 

bugfix: Add missing conditions for kraken release
pull/1304/head
Andrew Schoen 2017-02-10 10:02:10 -06:00 committed by GitHub
parent 5ddfc4f85c e63631a4ab
commit 315b1bf702
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@
always_run: true always_run: true
when: when:
- cephx - cephx
- ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel
# NOTE (leseb): wait for mon discovery and quorum resolution # NOTE (leseb): wait for mon discovery and quorum resolution
# the admin key is not instantaneously created so we have to wait a bit # the admin key is not instantaneously created so we have to wait a bit

2
roles/ceph-mon/tasks/create_mds_filesystems.yml
View File

@ -18,11 +18,13 @@
command: ceph --cluster {{ cluster }} fs set {{ cephfs }} allow_multimds true --yes-i-really-mean-it command: ceph --cluster {{ cluster }} fs set {{ cephfs }} allow_multimds true --yes-i-really-mean-it
changed_when: false changed_when: false
when: when:
- ceph_release_num.{{ ceph_release }} >= ceph_release_num.jewel
- mds_allow_multimds - mds_allow_multimds
- name: set max_mds - name: set max_mds
command: ceph --cluster {{ cluster }} fs set {{ cephfs }} max_mds {{ mds_max_mds }} command: ceph --cluster {{ cluster }} fs set {{ cephfs }} max_mds {{ mds_max_mds }}
changed_when: false changed_when: false
when: when:
- ceph_release_num.{{ ceph_release }} >= ceph_release_num.jewel
- mds_allow_multimds - mds_allow_multimds
- mds_max_mds > 1 - mds_max_mds > 1

1
roles/ceph-rgw/tasks/main.yml
View File

@ -21,6 +21,7 @@
when: when:
- rgw_zone is defined - rgw_zone is defined
- rgw_multisite - rgw_multisite
- ( ceph_release_num.{{ ceph_release }} >= ceph_release_num.jewel )
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent) # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
static: False static: False