openstack
/
nova
Code Issues Proposed changes

Config options: centralize scality libvirt options (15) 

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 15th patch in a long-chain patchs.

Change-Id: I737ec45d2fea4ab4de654dc79e58a4b9f398d2c2
Co-Authored-by: Markus Zoeller <mzoeller@de.ibm.com>
Implements: blueprint centralize-config-options-newton
This commit is contained in:
Hieu LE 2016-04-22 19:03:43 +07:00 committed by John Garbutt
parent 421c52d9d3
commit 960363fb99
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nova/conf/libvirt.py
View File

@ -370,6 +370,14 @@ libvirt_volume_quobyte_opts = [
help='Path to a Quobyte Client configuration file.'),
]
libvirt_volume_scality_opts = [
cfg.StrOpt('scality_sofs_config',
help='Path or URL to Scality SOFS configuration file'),
cfg.StrOpt('scality_sofs_mount_point',
default='$state_path/scality',
help='Base dir where Scality SOFS shall be mounted'),
]
ALL_OPTS = list(itertools.chain(
libvirt_general_opts,
libvirt_imagebackend_opts,
@ -385,6 +393,7 @@ ALL_OPTS = list(itertools.chain(
libvirt_volume_net_opts,
libvirt_volume_nfs_opts,
libvirt_volume_quobyte_opts,
libvirt_volume_scality_opts,
))

13
nova/virt/libvirt/volume/scality.py
View File

@ -13,11 +13,11 @@
import io
import os
from oslo_config import cfg
from oslo_log import log as logging
from six.moves import urllib
import six.moves.urllib.parse as urlparse
import nova.conf
from nova import exception
from nova.i18n import _
from nova import utils
@ -25,16 +25,7 @@ from nova.virt.libvirt.volume import fs
LOG = logging.getLogger(__name__)
volume_opts = [
cfg.StrOpt('scality_sofs_config',
help='Path or URL to Scality SOFS configuration file'),
cfg.StrOpt('scality_sofs_mount_point',
default='$state_path/scality',
help='Base dir where Scality SOFS shall be mounted'),
]
CONF = cfg.CONF
CONF.register_opts(volume_opts, 'libvirt')
CONF = nova.conf.CONF
class LibvirtScalityVolumeDriver(fs.LibvirtBaseFileSystemVolumeDriver):

2
nova/virt/opts.py
View File

@ -13,7 +13,6 @@
import itertools
import nova.virt.libvirt.volume.remotefs
import nova.virt.libvirt.volume.scality
import nova.virt.libvirt.volume.smbfs
import nova.virt.xenapi.agent
import nova.virt.xenapi.pool
@ -27,7 +26,6 @@ def list_opts():
('libvirt',
itertools.chain(
nova.virt.libvirt.volume.remotefs.libvirt_opts,
nova.virt.libvirt.volume.scality.volume_opts,
nova.virt.libvirt.volume.smbfs.volume_opts,
)),
('xenserver',