From b6f16164c65b3ff71d403f8a73a0f57aa586ca1c Mon Sep 17 00:00:00 2001 From: leseb Date: Mon, 6 Jul 2015 13:58:08 +0200 Subject: [PATCH] Add more client options Add `rbd_default_features` and `rbd_default_map_options`. Signed-off-by: leseb --- group_vars/all | 2 ++ roles/ceph-common/defaults/main.yml | 2 ++ roles/ceph-common/templates/ceph.conf.j2 | 2 ++ 3 files changed, 6 insertions(+) diff --git a/group_vars/all b/group_vars/all index 3a0e504b7..f9504bb4c 100644 --- 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 789bea29f..4e9fc9ac0 100644 --- 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 rbd_client_log_path: /var/log/rbd-clients/ rbd_client_admin_socket_path: /var/run/ceph/rbd-clients # must be writable by QEMU and allowed by SELinux or AppArmor +rbd_default_features: 3 +rbd_default_map_options: rw ## Monitor options # diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2 index 29c690bf6..469946259 100644 --- 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 }} -- 2.39.5