Remove deprecated allow_multimds

allow_multimds will be officially deprecated in Mimic, specify it
only for all versions of Ceph where it was declared stable. Going
forward, specify only max_mds.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index cddfb92093db69f75669ae763d9749eff1dfaa36..d6ad290c16280e9e85dba06de34f5a945e2072c2 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -364,7 +364,6 @@ dummy:
 ## MDS options
 #
 #mds_use_fqdn: false # if set to true, the MDS name used will be the fqdn in the ceph.conf
-#mds_allow_multimds: false
 #mds_max_mds: 3
 
 ## Rados Gateway options

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 40578c489691beb929948f04d775c16bb9744365..2010e8843044daba5d01c3f2e2d13898d2ed3662 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -364,7 +364,6 @@ ceph_repository: rhcs
 ## MDS options
 #
 #mds_use_fqdn: false # if set to true, the MDS name used will be the fqdn in the ceph.conf
-#mds_allow_multimds: false
 #mds_max_mds: 3
 
 ## Rados Gateway options

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index cfb882245e51377ccf159bf9296735be182cb208..081833491be02bdbfe218629f3e41c418630211e 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -356,7 +356,6 @@ filestore_xattr_use_omap: null
 ## MDS options
 #
 mds_use_fqdn: false # if set to true, the MDS name used will be the fqdn in the ceph.conf
-mds_allow_multimds: false
 mds_max_mds: 3
 
 ## Rados Gateway options

diff --git a/roles/ceph-mon/tasks/create_mds_filesystems.yml b/roles/ceph-mon/tasks/create_mds_filesystems.yml
index 60976ba947d525a8ae98035d361c9335360f5284..75df0a29be9e5cc6b8218cd95f12cbe21784b513 100644 (file)
--- a/roles/ceph-mon/tasks/create_mds_filesystems.yml
+++ b/roles/ceph-mon/tasks/create_mds_filesystems.yml
@@ -22,12 +22,11 @@
   changed_when: false
   when:
     - ceph_release_num[ceph_release] >= ceph_release_num.jewel
-    - mds_allow_multimds
+    - ceph_release_num[ceph_release] < ceph_release_num.mimic
 
 - name: set max_mds
   command: "{{ docker_exec_cmd }} ceph --cluster {{ cluster }} fs set {{ cephfs }} max_mds {{ mds_max_mds }}"
   changed_when: false
   when:
     - ceph_release_num[ceph_release] >= ceph_release_num.jewel
-    - mds_allow_multimds
     - mds_max_mds > 1