doc: note raw format required for openstack/rbd

A couple people have been confused by this omission.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/doc/rbd/rbd-openstack.rst b/doc/rbd/rbd-openstack.rst
index ea46b51990bc06ceca3bfbf51f0f42bda68611c6..e72a032147169870784d76b4d4e0dc15bbb6feef 100644 (file)
--- a/doc/rbd/rbd-openstack.rst
+++ b/doc/rbd/rbd-openstack.rst
@@ -209,6 +209,11 @@ using the Cinder command line tool::
 
     cinder create --image-id {id of image} --display-name {name of volume} {size of volume}
 
+Note that image must be raw format. You can use `qemu-img`_ to convert
+from one format to another, i.e.::
+
+    qemu-img convert -f qcow2 -O raw precise-cloudimg.img precise-cloudimg.raw
+
 Before Ceph 0.52 the image will be a full copy of the data. With Ceph 0.52 and
 later when Glance and Cinder are both using Ceph block devices, the image is a
 copy-on-write clone, so volume creation is very fast.
@@ -216,3 +221,5 @@ copy-on-write clone, so volume creation is very fast.
 In the OpenStack dashboard you can then boot from that volume by launching a new
 instance, choosing the image that you created the volume from, and selecting
 'boot from volume' and the volume you created.
+
+.. _qemu-img: ../qemu-rbd/#running-qemu-with-rbd

diff --git a/src/leveldb b/src/leveldb
index c79c270174307411819ddfdd8c9b671ec4fb69c9..f2d406b4213a22bfed3acfdb071fbec9ca9205cc 160000 (submodule)
--- a/src/leveldb
+++ b/src/leveldb
@@ -1 +1 @@
-Subproject commit c79c270174307411819ddfdd8c9b671ec4fb69c9
+Subproject commit f2d406b4213a22bfed3acfdb071fbec9ca9205cc