mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-03 03:25:20 +00:00
Revert "conf: Remove volOptions for VIR_STORAGE_POOL_RBD"
This reverts commit 035db37394
Even though we only allow using RBD with raw volumes,
removing the options and the default format causes our
parser not to fill out the volume format and the backend code
rejects creating a non-raw volume.
Re-introduce the volume options to fix volume creation while
erroring out on requests to use non-raw formats.
https://bugzilla.redhat.com/show_bug.cgi?id=1724065
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
parent
9b7c4048fa
commit
5d74619329
@ -241,6 +241,11 @@ static virStoragePoolTypeInfo poolTypeInfo[] = {
|
||||
VIR_STORAGE_POOL_SOURCE_NETWORK |
|
||||
VIR_STORAGE_POOL_SOURCE_NAME),
|
||||
},
|
||||
.volOptions = {
|
||||
.defaultFormat = VIR_STORAGE_FILE_RAW,
|
||||
.formatFromString = virStorageVolumeFormatFromString,
|
||||
.formatToString = virStorageFileFormatTypeToString,
|
||||
}
|
||||
},
|
||||
{.poolType = VIR_STORAGE_POOL_SHEEPDOG,
|
||||
.poolOptions = {
|
||||
|
@ -145,6 +145,11 @@
|
||||
<pool type='mpath' supported='no'>
|
||||
</pool>
|
||||
<pool type='rbd' supported='no'>
|
||||
<volOptions>
|
||||
<defaultFormat type='raw'/>
|
||||
<enum name='targetFormatType'>
|
||||
</enum>
|
||||
</volOptions>
|
||||
</pool>
|
||||
<pool type='sheepdog' supported='no'>
|
||||
</pool>
|
||||
|
@ -145,6 +145,11 @@
|
||||
<pool type='mpath' supported='yes'>
|
||||
</pool>
|
||||
<pool type='rbd' supported='yes'>
|
||||
<volOptions>
|
||||
<defaultFormat type='raw'/>
|
||||
<enum name='targetFormatType'>
|
||||
</enum>
|
||||
</volOptions>
|
||||
</pool>
|
||||
<pool type='sheepdog' supported='yes'>
|
||||
</pool>
|
||||
|
Loading…
Reference in New Issue
Block a user