diskbackend: Drop support for sheepdog

The sheepdog project is no longer actively developed, Libvirt removed
the support for sheepdog storage backend since v8.8.0, Let's drop it.

Signed-off-by: Lin Ma <lma@suse.com>
This commit is contained in:
Lin Ma 2022-11-02 20:45:43 +08:00 committed by Cole Robinson
parent 15ddeae6cb
commit 4a2df06483
5 changed files with 7 additions and 47 deletions

View File

@ -1,5 +1,5 @@
<disk type="file" device="disk"> <disk type="file" device="disk">
<driver name="qemu" type="qcow2"/> <driver name="qemu" type="qcow2"/>
<source file="/pool-dir/testvol1.img"/> <source file="/pool-dir/testvol1.img"/>
<target dev="vdag" bus="virtio"/> <target dev="vdaf" bus="virtio"/>
</disk> </disk>

View File

@ -1,5 +1,5 @@
<disk type="volume" device="disk"> <disk type="volume" device="disk">
<driver name="qemu" type="raw"/> <driver name="qemu" type="raw"/>
<source volume="sdfg1" pool="pool-disk"/> <source volume="sdfg1" pool="pool-disk"/>
<target dev="vdag" bus="virtio"/> <target dev="vdaf" bus="virtio"/>
</disk> </disk>

View File

@ -294,26 +294,19 @@ Foo bar baz &amp; yeah boii &lt; &gt; yeahfoo
</source> </source>
<target dev='vdac' bus='virtio'/> <target dev='vdac' bus='virtio'/>
</disk> </disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
<source protocol='sheepdog' name='image,with,commas'>
<host name='example.org' port='6000'/>
</source>
<target dev='vdad' bus='virtio'/>
</disk>
<disk type='network' device='disk'> <disk type='network' device='disk'>
<driver name='qemu' type='raw'/> <driver name='qemu' type='raw'/>
<source protocol='gluster' name='test-volume/test-gluster2.raw'> <source protocol='gluster' name='test-volume/test-gluster2.raw'>
<host name='192.168.1.100'/> <host name='192.168.1.100'/>
</source> </source>
<target dev='vdae' bus='virtio'/> <target dev='vdad' bus='virtio'/>
</disk> </disk>
<disk type='network' device='disk'> <disk type='network' device='disk'>
<driver name='qemu' type='raw'/> <driver name='qemu' type='raw'/>
<source protocol='nbd'> <source protocol='nbd'>
<host transport='unix' socket='relative.sock'/> <host transport='unix' socket='relative.sock'/>
</source> </source>
<target dev='vdaf' bus='virtio'/> <target dev='vdae' bus='virtio'/>
</disk> </disk>
<!-- bus usb --> <!-- bus usb -->
@ -2171,35 +2164,6 @@ ba</description>
</pool> </pool>
<pool type='sheepdog'>
<name>pool-sheepdog</name>
<uuid>581381f8-a13f-4f7c-89b5-9c9b71c64834</uuid>
<capacity unit='bytes'>107374182400</capacity>
<allocation unit='bytes'>53687091200</allocation>
<available unit='bytes'>53687091200</available>
<source>
<host name='localhost' port='7000'/>
<name>mysheeppool</name>
</source>
<volume type='network'>
<name>vol_sheepdog</name>
<key>sheep/vol_sheepdog</key>
<capacity unit='bytes'>1024</capacity>
<allocation unit='bytes'>0</allocation>
<target>
<path>sheepdog:vol_sheepdog</path>
<format type='unknown'/>
<permissions>
<mode>0600</mode>
<owner>-1</owner>
<group>-1</group>
</permissions>
</target>
</volume>
</pool>
<pool type='gluster'> <pool type='gluster'>
<name>pool-gluster</name> <name>pool-gluster</name>
<uuid>7b83ef6d-28da-44f1-841f-2011320f13b0</uuid> <uuid>7b83ef6d-28da-44f1-841f-2011320f13b0</uuid>

View File

@ -32,7 +32,6 @@ POOL_TYPE_DESCS = {
StoragePool.TYPE_MPATH: _("Multipath Device Enumerator"), StoragePool.TYPE_MPATH: _("Multipath Device Enumerator"),
StoragePool.TYPE_GLUSTER: _("Gluster Filesystem"), StoragePool.TYPE_GLUSTER: _("Gluster Filesystem"),
StoragePool.TYPE_RBD: _("RADOS Block Device/Ceph"), StoragePool.TYPE_RBD: _("RADOS Block Device/Ceph"),
StoragePool.TYPE_SHEEPDOG: _("Sheepdog Filesystem"),
StoragePool.TYPE_ZFS: _("ZFS Pool"), StoragePool.TYPE_ZFS: _("ZFS Pool"),
} }
@ -128,7 +127,6 @@ class vmmStoragePool(vmmLibvirtObject):
] ]
if not clone: if not clone:
supported.extend([ supported.extend([
StoragePool.TYPE_SHEEPDOG,
StoragePool.TYPE_ZFS, StoragePool.TYPE_ZFS,
]) ])
return pool_type in supported return pool_type in supported

View File

@ -82,7 +82,6 @@ class StoragePool(_StorageObject):
TYPE_MPATH = "mpath" TYPE_MPATH = "mpath"
TYPE_GLUSTER = "gluster" TYPE_GLUSTER = "gluster"
TYPE_RBD = "rbd" TYPE_RBD = "rbd"
TYPE_SHEEPDOG = "sheepdog"
TYPE_ZFS = "zfs" TYPE_ZFS = "zfs"
@staticmethod @staticmethod
@ -311,7 +310,7 @@ class StoragePool(_StorageObject):
def supports_source_name(self): def supports_source_name(self):
return self.type in [self.TYPE_LOGICAL, self.TYPE_GLUSTER, return self.type in [self.TYPE_LOGICAL, self.TYPE_GLUSTER,
self.TYPE_RBD, self.TYPE_SHEEPDOG, self.TYPE_ZFS] self.TYPE_RBD, self.TYPE_ZFS]
def supports_source_path(self): def supports_source_path(self):
@ -323,7 +322,7 @@ class StoragePool(_StorageObject):
def supports_hosts(self): def supports_hosts(self):
return self.type in [ return self.type in [
self.TYPE_NETFS, self.TYPE_ISCSI, self.TYPE_GLUSTER, self.TYPE_NETFS, self.TYPE_ISCSI, self.TYPE_GLUSTER,
self.TYPE_RBD, self.TYPE_SHEEPDOG] self.TYPE_RBD]
def supports_format(self): def supports_format(self):
return self.type in [self.TYPE_FS, self.TYPE_NETFS, self.TYPE_DISK] return self.type in [self.TYPE_FS, self.TYPE_NETFS, self.TYPE_DISK]
@ -340,8 +339,7 @@ class StoragePool(_StorageObject):
return StorageVolume.TYPE_BLOCK return StorageVolume.TYPE_BLOCK
if (self.type == StoragePool.TYPE_GLUSTER or if (self.type == StoragePool.TYPE_GLUSTER or
self.type == StoragePool.TYPE_RBD or self.type == StoragePool.TYPE_RBD or
self.type == StoragePool.TYPE_ISCSI or self.type == StoragePool.TYPE_ISCSI):
self.type == StoragePool.TYPE_SHEEPDOG):
return StorageVolume.TYPE_NETWORK return StorageVolume.TYPE_NETWORK
return StorageVolume.TYPE_FILE return StorageVolume.TYPE_FILE