From 767161a347ceb53edf4b71a0c0876d2aa2111ae1 Mon Sep 17 00:00:00 2001 From: Changcheng Liu Date: Mon, 16 Dec 2019 12:50:50 +0800 Subject: [PATCH 1/2] doc/rbd: correct software stack of VM with Ceph Signed-off-by: Changcheng Liu --- doc/install/install-vm-cloud.rst | 2 ++ doc/rbd/libvirt.rst | 2 ++ 2 files changed, 4 insertions(+) diff --git a/doc/install/install-vm-cloud.rst b/doc/install/install-vm-cloud.rst index a28a76a28f74f..3e1db12370f48 100644 --- a/doc/install/install-vm-cloud.rst +++ b/doc/install/install-vm-cloud.rst @@ -19,6 +19,8 @@ of Cloud Platforms include OpenStack, CloudStack, OpenNebula, etc. | QEMU | +---------------------------------------------------+ | librbd | + +---------------------------------------------------+ + | librados | +------------------------+-+------------------------+ | OSDs | | Monitors | +------------------------+ +------------------------+ diff --git a/doc/rbd/libvirt.rst b/doc/rbd/libvirt.rst index 76027734208c9..186c95273df7e 100644 --- a/doc/rbd/libvirt.rst +++ b/doc/rbd/libvirt.rst @@ -31,6 +31,8 @@ illustrates how ``libvirt`` and QEMU use Ceph block devices via ``librbd``. | QEMU | +---------------------------------------------------+ | librbd | + +---------------------------------------------------+ + | librados | +------------------------+-+------------------------+ | OSDs | | Monitors | +------------------------+ +------------------------+ From e16ac01742251c7834b91398c5bfc56e20863487 Mon Sep 17 00:00:00 2001 From: Changcheng Liu Date: Mon, 16 Dec 2019 19:41:26 +0800 Subject: [PATCH 2/2] doc/rbd: remind Selinux/AppArmor effect on libvirtd If libvird is under Selinux/Apparmor enforced mode, libvirtd may not be enable to do some operatoins on the rbd image. It need remind this in document. Signed-off-by: Changcheng Liu --- doc/rbd/libvirt.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/rbd/libvirt.rst b/doc/rbd/libvirt.rst index 186c95273df7e..3488096628c38 100644 --- a/doc/rbd/libvirt.rst +++ b/doc/rbd/libvirt.rst @@ -109,10 +109,11 @@ To configure Ceph for use with ``libvirt``, perform the following steps: admin socket = /var/run/ceph/$cluster-$type.$id.$pid.$cctid.asok The ``client.libvirt`` section name should match the cephx user you created - above. If SELinux or AppArmor is enabled, note that this could prevent the - client process (qemu via libvirt) from writing the logs or admin socket to - the destination locations (``/var/log/ceph`` or ``/var/run/ceph``). - + above. + If SELinux or AppArmor is enabled, note that this could prevent the client + process (qemu via libvirt) from doing some operations, such as writing logs + or operate the images or admin socket to the destination locations (``/var/ + log/ceph`` or ``/var/run/ceph``). Preparing the VM Manager