multimds: add commands to enable and set max_mds

Also regenerated group_vars.

Fixes #986.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/group_vars/all.sample b/group_vars/all.sample
index feff95f6c975dd74f6810214e021a6382dba6bd9..0f68fa5dc6d79dff791845f60e9508b300ab5eeb 100644 (file)
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -109,6 +109,19 @@ dummy:
 #ceph_stable_release: jewel # ceph stable release
 #ceph_stable_repo: "http://download.ceph.com/debian-{{ ceph_stable_release }}"
 
+######################################
+# Releases name to number dictionary #
+######################################
+#ceph_release_num:
+#  dumpling: 0.67
+#  emperor: 0.72
+#  firefly: 0.80
+#  giant: 0.87
+#  hammer: 0.94
+#  infernalis: 9
+#  jewel: 10
+#  kraken: 11
+
 # Use the option below to specify your applicable package tree, eg. when using non-LTS Ubuntu versions
 # # for a list of available Debian distributions, visit http://download.ceph.com/debian-{{ ceph_stable_release }}/dists/
 # for more info read: https://github.com/ceph/ceph-ansible/issues/305
@@ -260,6 +273,8 @@ 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/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index ae604acac7ca7c1e2e3081b52fdaa2f274388c8c..31de9cd700258facf86f042c5d20cdf54b04fe0c 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -265,6 +265,8 @@ 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 8b784f35deeb5c954dded33e7b2107a725ded3a8..e114b1511a3ef8fc709d6afb7191be7d47f78f6e 100644 (file)
--- a/roles/ceph-mon/tasks/create_mds_filesystems.yml
+++ b/roles/ceph-mon/tasks/create_mds_filesystems.yml
@@ -15,3 +15,18 @@
   command: ceph --cluster {{ cluster }} fs new {{ cephfs }} {{ cephfs_metadata }} {{ cephfs_data }}
   changed_when: false
   when: ceph_release_num.{{ ceph_release }} > ceph_release_num.firefly
+
+- name: allow multimds
+  command: ceph --cluster {{ cluster }} fs set {{ cephfs }} allow_multimds true --yes-i-really-mean-it
+  changed_when: false
+  when:
+  - ceph_release_num.{{ ceph_release }} >= ceph_release_num.jewel
+  - mds_allow_multimds
+
+- name: set max_mds
+  command: 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