From b6d5c6634f57897222b78c1a91f51776d70ab86f Mon Sep 17 00:00:00 2001 From: leseb Date: Wed, 8 Jul 2015 14:21:16 +0200 Subject: [PATCH] Add support for image format By default, we want to use format 2. This closely works with rbd features as well. Signed-off-by: leseb --- group_vars/all | 1 + roles/ceph-common/defaults/main.yml | 1 + roles/ceph-common/templates/ceph.conf.j2 | 1 + 3 files changed, 3 insertions(+) diff --git a/group_vars/all b/group_vars/all index 89fbd4c96..058e1e137 100644 --- a/group_vars/all +++ b/group_vars/all @@ -100,6 +100,7 @@ dummy: #rbd_client_admin_socket_path: /var/run/ceph/rbd-clients/ #rbd_default_features: 3 #rbd_default_map_options: rw +#rbd_default_format: 2 ## Monitor options # diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml index 4fda993dd..d1dd9c2a6 100644 --- a/roles/ceph-common/defaults/main.yml +++ b/roles/ceph-common/defaults/main.yml @@ -108,6 +108,7 @@ 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 +rbd_default_format: 2 ## Monitor options # diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2 index 5863871ad..e5ed65ce6 100644 --- a/roles/ceph-common/templates/ceph.conf.j2 +++ b/roles/ceph-common/templates/ceph.conf.j2 @@ -69,6 +69,7 @@ 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 + rbd default format = {{ rbd_default_format }} [mon] mon osd down out interval = {{ mon_osd_down_out_interval }}