summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Durgin <josh.durgin@inktank.com>2013-05-30 14:17:35 -0700
committerJosh Durgin <josh.durgin@inktank.com>2013-05-30 14:17:35 -0700
commite9c32b97aa2235d5bb420e849e58d699a6f7aa8d (patch)
tree26d9748f9ff80e0e11f04496069e6c9895ecc52d
parent5fa098f10a05572b35d93ed16821a63749242ff9 (diff)
downloadceph-e9c32b97aa2235d5bb420e849e58d699a6f7aa8d.tar.gz
doc: note openstack changes for Grizzly
These are just for the cinder configuration, nothing else changed. Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
-rw-r--r--doc/rbd/rbd-openstack.rst13
1 files changed, 10 insertions, 3 deletions
diff --git a/doc/rbd/rbd-openstack.rst b/doc/rbd/rbd-openstack.rst
index ee9e6486da2..b37c018da9f 100644
--- a/doc/rbd/rbd-openstack.rst
+++ b/doc/rbd/rbd-openstack.rst
@@ -171,10 +171,17 @@ Configuring Cinder/nova-volume
OpenStack requires a driver to interact with Ceph block devices. You must also
specify the pool name for the block device. On your OpenStack host,
-edit ``/etc/cinder/cinder.conf`` and add::
+edit ``/etc/cinder/cinder.conf`` and add this for Folsom or earlier
+versions of OpenStack::
- volume_driver=cinder.volume.driver.RBDDriver
- rbd_pool=volumes
+ volume_driver=cinder.volume.driver.RBDDriver
+ rbd_pool=volumes
+
+For Grizzly, use::
+
+ volume_driver=cinder.volume.drivers.rbd.RBDDriver
+ rbd_pool=volumes
+ glance_api_version=2
If you're not using Cinder, replace Cinder with Nova in the previous section.