On Mon, Sep 30, 2013 at 11:53 AM, Thomas Thrainer <[email protected]> wrote: > Why is 'either' a special word in this sentence?
I did that because the careless reader might've understood that you had to run both commands provided there. I hoped that making either italics would make this more obvious. I reworded the whole section anyway. As for being specific about what versions and features you need, [0] mentions the relevant library is libvirt; after checking out a copy of libvirt I ran: ~/libvirt$ git log --pretty=oneline --grep rbd --grep RBD | tail -n 1 036ad5052b43fe9f0d197e89fd16715950408e1d add network disk support ~/libvirt$ git describe 036ad5052b43fe9f0d197e89fd16715950408e1d v0.8.6-77-g036ad50 So that's 77 revisions after 0.8.6, i.e. in 0.8.7 (qgit seems to confirm this). [0]: http://ceph.com/docs/next/rbd/libvirt/ Interdiff: diff --git a/NEWS b/NEWS index 37472a0..11d7444 100644 --- a/NEWS +++ b/NEWS @@ -9,11 +9,8 @@ Version 2.10.0 alpha1 New features ~~~~~~~~~~~~ -- KVM hypervisors can now access RBD storage directly without having to - mount a block device. This is also faster as everything happens in - userspace. Use '-S access:userspace' at cluster init time to enable. - - +- KVM hypervisors can now access RBD storage directly without having to + mount a block device. Incompatible/important changes ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/install.rst b/doc/install.rst index 577dd8c..647eafd 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -370,16 +370,24 @@ above. We recommend using the latest version of ``ceph-common``. KVM userspace access ~~~~~~~~~~~~~~~~~~~~ -If your cluster uses a sufficiently new and feature-complete version of -KVM, you can skip the kernel module setup and rely directly on KVM's -native support for ceph. +If your cluster uses a sufficiently new version of KVM (you will need at +least libvirt v0.8.7), you can skip the kernel module setup and rely +directly on KVM's native support for ceph. -You can enable support for this feature once your cluster has been -initialized with `either` of the following commands:: +To initialize a cluster with support for this feature, use a command +such as:: - $ gnt-cluster modify -D rbd:access=userspace - $ gnt-group modify -D rbd:access=userspace affected_group + $ gnt-cluster init \ + --enabled-disk-templates rbd \ + --ipolicy-disk-templates rbd \ + --enabled-hypervisors=kvm \ + -D rbd:access=userspace +(You may want to enable more templates than just ``rbd``.) + +You can also change this setting on a live cluster by giving the same +switches to ``gnt-cluster modify``, or change those settings at the node +group level with ``gnt-group modify``. Configuration file ~~~~~~~~~~~~~~~~~~ @@ -390,34 +398,19 @@ only need to specify the IP addresses of the RADOS Cluster monitors. .. admonition:: ceph.conf - Sample configuration file with one monitor and three object storage - daemons, with cluster traffic only happening on the replication - network. + Sample configuration file: .. code-block:: text - [global] - auth supported = cephx - public network = 1.2.3.0/24 - private network = 1.2.4.0/24 - [osd.0] - host = example_storage_host1 - public addr = 1.2.3.1 - cluster addr = 1.2.4.1 - [osd.1] - host = example_monitor_host2 - public addr = 1.2.3.2 - cluster addr = 1.2.4.2 - [osd.2] - host = example_monitor_host3 - public addr = 1.2.3.3 - cluster addr = 1.2.4.3 [mon.a] - host = example_monitor_host + host = example_monitor_host1 mon addr = 1.2.3.4:6789 - - Note that "public" addresses are called "primary" in Ganeti terminology, - whereas "cluster" addresses are the nodes' "secondary" addresses. + [mon.b] + host = example_monitor_host2 + mon addr = 1.2.3.5:6789 + [mon.c] + host = example_monitor_host3 + mon addr = 1.2.3.6:6789 For more information, please see the `Ceph Docs <http://ceph.newdream.net/docs/latest/>`_ diff --git a/man/gnt-cluster.rst b/man/gnt-cluster.rst index 0c3d79a..8643710 100644 --- a/man/gnt-cluster.rst +++ b/man/gnt-cluster.rst @@ -476,8 +476,8 @@ access for deadlocks_ in low memory scenarios. The default value is 'kernelspace' and it disables this behaviour. - This setting may only be changed to 'userspace' if all instances - in the affected group or cluster can be accessed in userspace. + This setting may only be changed to 'userspace' if all instance + disks in the affected group or cluster can be accessed in userspace. Attempts to use this feature without rbd support compiled in KVM result in "no such file or directory" error messages. -- Raffa Santi Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
