Config options: centralize smbfs libvirt options (16)

The config options of the "nova.conf" section "libvirt" got
moved to the new central location "nova/conf/libvirt.py".
Subsequent patches will then move another options in libvirt section.
This is the 16th patch in a long-chain patchs.

Change-Id: I6742c6125bf5178efcfa2f20776698acde411dac
Co-Authored-by: Markus Zoeller <mzoeller@de.ibm.com>
Implements: blueprint centralize-config-options-newton

nova/conf/libvirt.py

@@ -378,6 +378,18 @@ libvirt_volume_scality_opts = [
                help='Base dir where Scality SOFS shall be mounted'),
 ]
 
+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'),
+    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.'),
+]
+
 ALL_OPTS = list(itertools.chain(
     libvirt_general_opts,
     libvirt_imagebackend_opts,
@@ -394,6 +406,7 @@ ALL_OPTS = list(itertools.chain(
     libvirt_volume_nfs_opts,
     libvirt_volume_quobyte_opts,
     libvirt_volume_scality_opts,
+    libvirt_volume_smbfs_opts,
 ))
 
 

nova/virt/libvirt/volume/smbfs.py

@@ -12,28 +12,12 @@
 
 import re
 
-from oslo_config import cfg
-
 import nova.conf
-from nova.conf import paths
 from nova.virt.libvirt import utils as libvirt_utils
 from nova.virt.libvirt.volume import fs
 from nova.virt.libvirt.volume import remotefs
 
-volume_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'),
-    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.'),
-    ]
-
 CONF = nova.conf.CONF
-CONF.register_opts(volume_opts, 'libvirt')
 
 USERNAME_REGEX = re.compile(r"(user(?:name)?)=(?:[^ ,]+\\)?([^ ,]+)")
 

nova/virt/opts.py

@@ -13,7 +13,6 @@
 import itertools
 
 import nova.virt.libvirt.volume.remotefs
-import nova.virt.libvirt.volume.smbfs
 import nova.virt.xenapi.agent
 import nova.virt.xenapi.vmops
 
@@ -23,6 +22,5 @@ def list_opts():
         ('libvirt',
          itertools.chain(
              nova.virt.libvirt.volume.remotefs.libvirt_opts,
-             nova.virt.libvirt.volume.smbfs.volume_opts,
          )),
     ]