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 <seb@redhat.com>

diff --git a/group_vars/all b/group_vars/all
index 89fbd4c96d4f97ac4ac07649f72c7037f3958fe6..058e1e137c99cfdb105b689fdcd2437a6d713ca3 100644 (file)
--- 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 4fda993dd79e9d8b971f2904526ebbfed921b1b1..d1dd9c2a679ce597341c4e841c29d4f3f2a7b1f1 100644 (file)
--- 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\r
 rbd_default_features: 3\r
 rbd_default_map_options: rw\r
+rbd_default_format: 2\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 5863871ad665ef639a573e48ed48b9a18d42f420..e5ed65ce6e3d10448eae468f3c71c7c2b02e6ce4 100644 (file)
--- 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 }}