Skip to content

Commit

Permalink
libvirt: remove scality volume driver
Browse files Browse the repository at this point in the history
The Scality volume driver was removed from Cinder in Ocata:

a931f9db79554630d8d71fcff1334bb4e37cb398

It's unmaintained and therefore no longer supported, and won't
even work with recent Cinder, so let's remove it.

Change-Id: I0cfa0c4b3d7138f989225a44bdedfa716a035a14
  • Loading branch information
mriedem committed May 19, 2017
1 parent f60d848 commit 9e5b915
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 279 deletions.
1 change: 0 additions & 1 deletion etc/nova/rootwrap.d/compute.filters
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ tune2fs: CommandFilter, tune2fs, root
# nova/virt/disk/api.py: 'mount', '-o', 'bind', src, target
# nova/virt/xenapi/vm_utils.py: 'mount', '-t', 'ext2,ext3,ext4,reiserfs'..
# nova/virt/configdrive.py: 'mount', device, mountdir
# nova/virt/libvirt/volume.py: 'mount', '-t', 'sofs' ...
mount: CommandFilter, mount, root

# nova/virt/disk/mount/api.py: 'umount', mapped_device
Expand Down
26 changes: 0 additions & 26 deletions nova/conf/libvirt.py
Original file line number Diff line number Diff line change
Expand Up @@ -908,31 +908,6 @@
help='Path to a Quobyte Client configuration file.'),
]

libvirt_volume_scality_opts = [
cfg.StrOpt('scality_sofs_config',
help="""
Path or URL to Scality SOFS(Scale-Out File Server) configuration file.
The Scality SOFS provides OpenStack users the option of storing their
data on a high capacity, replicated, highly available Scality Ring object
storage cluster.
"""),
cfg.StrOpt('scality_sofs_mount_point',
default='$state_path/scality',
help="""
Base dir where Scality SOFS shall be mounted.
The Scality volume driver in Nova mounts SOFS and lets the hypervisor access
the volumes.
Possible values:
* $state_path/scality where state_path is a config option that specifies
the top-level directory for maintaining nova's state or Any string
containing the full directory path.
"""),
]

libvirt_volume_smbfs_opts = [
cfg.StrOpt('smbfs_mount_point_base',
default=paths.state_path_def('mnt'),
Expand Down Expand Up @@ -1092,7 +1067,6 @@
libvirt_volume_net_opts,
libvirt_volume_nfs_opts,
libvirt_volume_quobyte_opts,
libvirt_volume_scality_opts,
libvirt_volume_smbfs_opts,
libvirt_remotefs_opts,
libvirt_volume_vzstorage_opts,
Expand Down
115 changes: 0 additions & 115 deletions nova/tests/unit/virt/libvirt/volume/test_scality.py

This file was deleted.

1 change: 0 additions & 1 deletion nova/virt/libvirt/driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@
'fibre_channel='
'nova.virt.libvirt.volume.fibrechannel.'
'LibvirtFibreChannelVolumeDriver',
'scality=nova.virt.libvirt.volume.scality.LibvirtScalityVolumeDriver',
'gpfs=nova.virt.libvirt.volume.gpfs.LibvirtGPFSVolumeDriver',
'quobyte=nova.virt.libvirt.volume.quobyte.LibvirtQuobyteVolumeDriver',
'hgst=nova.virt.libvirt.volume.hgst.LibvirtHGSTVolumeDriver',
Expand Down
136 changes: 0 additions & 136 deletions nova/virt/libvirt/volume/scality.py

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
upgrade:
- |
The ``nova.virt.libvirt.volume.scality.LibvirtScalityVolumeDriver`` volume
driver has been removed. The Scality volume driver in Cinder was deprecated
during the Newton release and was removed from Cinder in the Ocata release
so it is effectively not maintained and therefore no longer supported.
- |
The following configuration options, previously found in the ``libvirt``
group, have been removed:
- ``scality_sofs_config``
- ``scality_sofs_mount_point``
These were used by the now-removed ``LibvirtScalityVolumeDriver`` volume
driver and therefore no longer had any effect.

0 comments on commit 9e5b915

Please sign in to comment.