From d896b627c64ab5888cd55b740d2afeaaface80bf Mon Sep 17 00:00:00 2001 From: Maciej Szankin Date: Tue, 27 Sep 2016 16:14:23 +0200 Subject: [PATCH] config options: improve libvirt smbfs Change-Id: I587ff640b76f92b8e63fbe9ba09fc64203e451cc Implements: blueprint centralize-config-options-ocata --- nova/conf/libvirt.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/nova/conf/libvirt.py b/nova/conf/libvirt.py index cb26732ad7..49dbd6254b 100644 --- a/nova/conf/libvirt.py +++ b/nova/conf/libvirt.py @@ -647,13 +647,18 @@ libvirt_volume_scality_opts = [ libvirt_volume_smbfs_opts = [ cfg.StrOpt('smbfs_mount_point_base', default=paths.state_path_def('mnt'), - help='Directory where the SMBFS shares are mounted on the ' - 'compute node'), + help=""" +Directory where the SMBFS shares are mounted on the compute node. +"""), cfg.StrOpt('smbfs_mount_options', default='', - help='Mount options passed to the SMBFS client. See ' - 'mount.cifs man page for details. Note that the ' - 'libvirt-qemu uid and gid must be specified.'), + help=""" +Mount options passed to the SMBFS client. + +Provide SMBFS options as a single string containing all parameters. +See mount.cifs man page for details. Note that the libvirt-qemu ``uid`` +and ``gid`` must be specified. +"""), ] libvirt_remotefs_opts = [