Ceph removed auth_supported option in commit 350cc71d, https://github.com/ceph/ceph/commit/350cc71d7d9e9cd6239d24080082de7ac9bf8b70
auth_supported has long been an optional parameter, and has been replaced by auth_*_required. The error occurs because libvirt always uses the auth_supported option when authenticating to rbd storage.Therefore, remove the code that uses this option. Resolves: https://gitlab.com/libvirt/libvirt/-/work_items/918 Signed-off-by: Yusuke Fujimaki <[email protected]> --- src/libxl/libxl_conf.c | 6 +----- src/libxl/xen_xl.c | 2 -- src/storage/storage_backend_rbd.c | 7 ------- tests/xlconfigdata/test-rbd-multihost-noauth.cfg | 2 +- 4 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 3bb5c1e591..184a143712 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1087,11 +1087,7 @@ libxlMakeNetworkDiskSrcStr(virStorageSource *src, if (username) { virBufferEscape(&buf, '\\', ":", ":id=%s", username); - virBufferEscape(&buf, '\\', ":", - ":key=%s:auth_supported=cephx\\;none", - secret); - } else { - virBufferAddLit(&buf, ":auth_supported=none"); + virBufferEscape(&buf, '\\', ":", ":key=%s", secret); } if (src->nhosts > 0) { diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index d05972af5b..952dd73c1a 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -1478,8 +1478,6 @@ xenFormatXLDiskSrcNet(virStorageSource *src) virBufferStrcat(&buf, "rbd:", src->path, NULL); - virBufferAddLit(&buf, ":auth_supported=none"); - if (src->nhosts > 0) { virBufferAddLit(&buf, ":mon_host="); for (i = 0; i < src->nhosts; i++) { diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 25cad4a28d..3981f81a79 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -239,10 +239,6 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDState *ptr, if (rc < 0) goto cleanup; - - if (virStorageBackendRBDRADOSConfSet(ptr->cluster, - "auth_supported", "cephx") < 0) - goto cleanup; } else { VIR_DEBUG("Not using cephx authorization"); if (rados_create(&ptr->cluster, NULL) < 0) { @@ -250,9 +246,6 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDState *ptr, _("failed to create the RADOS cluster")); goto cleanup; } - if (virStorageBackendRBDRADOSConfSet(ptr->cluster, - "auth_supported", "none") < 0) - goto cleanup; } VIR_DEBUG("Found %zu RADOS cluster monitors in the pool configuration", diff --git a/tests/xlconfigdata/test-rbd-multihost-noauth.cfg b/tests/xlconfigdata/test-rbd-multihost-noauth.cfg index 5906865047..933e5af75a 100644 --- a/tests/xlconfigdata/test-rbd-multihost-noauth.cfg +++ b/tests/xlconfigdata/test-rbd-multihost-noauth.cfg @@ -22,4 +22,4 @@ parallel = "none" serial = "none" builder = "hvm" boot = "d" -disk = [ "format=raw,vdev=hda,access=rw,backendtype=phy,target=/dev/HostVG/XenGuest2", "format=raw,vdev=hdb,access=rw,backendtype=qdisk,target=rbd:pool/image:auth_supported=none:mon_host=mon1.example.org\\:6321\\;mon2.example.org\\:6322\\;mon3.example.org\\:6322" ] +disk = [ "format=raw,vdev=hda,access=rw,backendtype=phy,target=/dev/HostVG/XenGuest2", "format=raw,vdev=hdb,access=rw,backendtype=qdisk,target=rbd:pool/image:mon_host=mon1.example.org\\:6321\\;mon2.example.org\\:6322\\;mon3.example.org\\:6322" ] -- 2.47.3
