Add more client options

Add `rbd_default_features` and `rbd_default_map_options`.

Signed-off-by: leseb <seb@redhat.com>

diff --git a/group_vars/all b/group_vars/all
index 3a0e504b7c402eb42eec1a0cb056b41719a7a1cf..f9504bb4c08bdb6c6b6e8adafbb7818656451e59 100644 (file)
--- a/group_vars/all
+++ b/group_vars/all
@@ -98,6 +98,8 @@ dummy:
 #rbd_client_log_file: /var/log/rbd-clients/qemu-guest-$pid.log # must be writable by QEMU and allowed by SELinux or AppArmor
 #rbd_client_log_path: /var/log/rbd-clients/
 #rbd_client_admin_socket_path: /var/run/ceph/rbd-clients/
+#rbd_default_features: 3
+#rbd_default_map_options: rw
 
 ## Monitor options
 #

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 789bea29f97959d4e54b4c660f52b77abcd1aee3..4e9fc9ac05e5e40acdb873c0ec5db5838908a347 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -106,6 +106,8 @@ rbd_client_directories: false # this will create rbd_client_log_path and rbd_cli
 rbd_client_log_file: /var/log/rbd-clients/qemu-guest-$pid.log # must be writable by QEMU and allowed by SELinux or AppArmor\r
 rbd_client_log_path: /var/log/rbd-clients/\r
 rbd_client_admin_socket_path: /var/run/ceph/rbd-clients # must be writable by QEMU and allowed by SELinux or AppArmor\r
+rbd_default_features: 3\r
+rbd_default_map_options: rw\r
 \r
 ## Monitor options\r
 #\r

diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2
index 29c690bf6c1a1d5243a5e593694d1bd51a3988d2..469946259a7f3da3f0ec2b18bbdf19795ec3fccd 100644 (file)
--- a/roles/ceph-common/templates/ceph.conf.j2
+++ b/roles/ceph-common/templates/ceph.conf.j2
@@ -67,6 +67,8 @@
   rbd concurrent management ops = {{ rbd_concurrent_management_ops }}
   admin socket = {{ rbd_client_admin_socket_path }}/$cluster-$type.$id.$pid.$cctid.asok # must be writable by QEMU and allowed by SELinux or AppArmor
   log file = {{ rbd_client_log_file }} # must be writable by QEMU and allowed by SELinux or AppArmor
+  rbd default map options = {{ rbd_default_map_options }}
+  rbd default features = {{ rbd_default_features }} # sum features digits
 
 [mon]
   mon osd down out interval = {{ mon_osd_down_out_interval }}