From nobody Sat Oct 24 20:20:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=none dis=none) header.from=undertheprinter.com ARC-Seal: i=1; a=rsa-sha256; t=1791924361; cv=none; d=zohomail.com; s=zohoarc; b=lXqdlZ2CV9ZnNztw/62Ru9Tn1WTL+9LxQhYYYNe6i9ykoClahNFF87jpOL0CtNRw0wGccDueNNAWrPPT0ZWl/aG5a0RgWm8XhHSWatYi0cV2Q6NKK3XWkIcwurbvDJ8IM1xQRKz3zNKSmbLwumBLp3nmMkxSgETW1IcswF0UiSE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1791924361; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=UTwLAoL43/x3ymWqJNV3r6pICj0MO+q44Gk1AbPMdLo=; b=nbfATSNqw3YH6Az0fhS4natBwK/xAqn6xMKiBH+hQBG3BFAxD3txuCDyX48+E5tkcHJN8+8Xqnlse7ZN8XGSvb/CiVKV3QynC3aDV9HEOvPP6n91/l3BteaWnrxtwJ5Zi5R0Se1UxlTEdvTWW1DIg0+mRg1kqx+bsMXAvm/n5Y4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 179192436166651.28874689978363; Tue, 13 Oct 2026 13:46:01 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 572F9418A9; Tue, 13 Oct 2026 16:46:00 -0400 (EDT) Received: from [172.19.199.16] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 0B88341AED; Tue, 13 Oct 2026 16:44:39 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 2AE143F313; Tue, 13 Oct 2026 16:44:31 -0400 (EDT) Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id F3F083F337 for ; Tue, 13 Oct 2026 16:44:29 -0400 (EDT) Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519MLKEM768 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4j45t23PQpzKp7R; Tue, 13 Oct 2026 22:44:26 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=undertheprinter.com; s=MBO0001; t=1791924266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=UTwLAoL43/x3ymWqJNV3r6pICj0MO+q44Gk1AbPMdLo=; b=crhPL/j1LHVdrKNh8AOzCMYHs3iqrX+P6E14KpQ7SuW54S9vwOSF0TSydNYYh3WK5HkgH/ L09EA8O2+SOmpLZ6LnDBqteQGo0M9yVlwaDho0k1TKONq95BoD6iqPwfgEqsAvlNl3xfMO u4cCd40yX7mJuKn6BM48+AwxsZDgb6gVM+p/ADUVqB+S7CyGWCo0Kzr2tnV+vE7c+uqiKn ufQBpQuCbsT5/wZPH52J3X7MQZ6afrL7I3gLKNG7BJ5gBoTPrxhC0SpHsC7dSR2pnL39af JyAGzPIL2DS+3NrWrSUK6VaYRLS/fY0kxU4iW5p3kGXoDV1q2Uu8N8DW4l/b7Q== Authentication-Results: outgoing_mbo_mout; dkim=none; spf=pass (outgoing_mbo_mout: domain of janis.heims@undertheprinter.com designates 2001:67c:2050:b231:465::2 as permitted sender) smtp.mailfrom=janis.heims@undertheprinter.com From: Janis Heims To: devel@lists.libvirt.org Subject: [PATCH v3] replace rbd option auth_supported with auth_*_required Date: Tue, 13 Oct 2026 22:39:42 +0200 Message-ID: <20261013204236.43496-2-janis.heims@undertheprinter.com> X-Mailer: git-send-email 2.54.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4j45t23PQpzKp7R Message-ID-Hash: 3GAEOA4XA3CHHBFI2NPZGRREPL4O246R X-Message-ID-Hash: 3GAEOA4XA3CHHBFI2NPZGRREPL4O246R X-MailFrom: janis.heims@undertheprinter.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Janis Heims X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @undertheprinter.com) X-ZM-MESSAGEID: 1791924364765158500 Content-Type: text/plain; charset="utf-8" As stated in Yusuke Fujimaki's patch, Ceph recently removed the deprecated auth_supported option that is still used by libvirt, causing errors when attempting to start a storage pool on a newer Ceph server: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/RELD= VG6A3LAA4IFA32EOFQ5OJPMI6OGR/ https://github.com/ceph/ceph/commit/350cc71d7d9e9cd6239d24080082de7ac9bf8b70 This patch addresses the issue by replacing the deprecated option with auth_client_required. While all three replacement options (auth_cluster_required, auth_service_required and auth_client_required) were previously set by Ceph, it really only makes sense to keep the last in libvirt as the other options are only relevant on the server side. See the discussion here: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/3TVM= 5DVH3MOIQAM6ZUS5TYBLNSA6UA7K/ Resolves: https://gitlab.com/libvirt/libvirt/-/work_items/918 Signed-off-by: Janis Heims Reviewed-by: J=C3=A1n Tomko --- Changes since v2: - Fixed corrupt patch Changes since v1: - Removed auth_cluster_required and auth_service_required src/libxl/libxl_conf.c | 7 +++---- src/libxl/xen_xl.c | 2 +- src/storage/storage_backend_rbd.c | 5 +++-- tests/xlconfigdata/test-rbd-multihost-noauth.cfg | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 3bb5c1e591..9050caf400 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1087,11 +1087,10 @@ libxlMakeNetworkDiskSrcStr(virStorageSource *src, =20 if (username) { virBufferEscape(&buf, '\\', ":", ":id=3D%s", username); - virBufferEscape(&buf, '\\', ":", - ":key=3D%s:auth_supported=3Dcephx\\;none", - secret); + virBufferEscape(&buf, '\\', ":", ":key=3D%s", secret); + virBufferAddLit(&buf, ":auth_client_required=3Dcephx\\;none"); } else { - virBufferAddLit(&buf, ":auth_supported=3Dnone"); + virBufferAddLit(&buf, ":auth_client_required=3Dnone"); } =20 if (src->nhosts > 0) { diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index d05972af5b..5a31fc6939 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -1478,7 +1478,7 @@ xenFormatXLDiskSrcNet(virStorageSource *src) =20 virBufferStrcat(&buf, "rbd:", src->path, NULL); =20 - virBufferAddLit(&buf, ":auth_supported=3Dnone"); + virBufferAddLit(&buf, ":auth_client_required=3Dnone"); =20 if (src->nhosts > 0) { virBufferAddLit(&buf, ":mon_host=3D"); diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backen= d_rbd.c index 25cad4a28d..9832a99264 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -241,7 +241,7 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDS= tate *ptr, goto cleanup; =20 if (virStorageBackendRBDRADOSConfSet(ptr->cluster, - "auth_supported", "cephx") < = 0) + "auth_client_required", "ceph= x") < 0) goto cleanup; } else { VIR_DEBUG("Not using cephx authorization"); @@ -250,8 +250,9 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDS= tate *ptr, _("failed to create the RADOS cluster")); goto cleanup; } + if (virStorageBackendRBDRADOSConfSet(ptr->cluster, - "auth_supported", "none") < 0) + "auth_client_required", "none= ") < 0) goto cleanup; } =20 diff --git a/tests/xlconfigdata/test-rbd-multihost-noauth.cfg b/tests/xlcon= figdata/test-rbd-multihost-noauth.cfg index 5906865047..8ff1878885 100644 --- a/tests/xlconfigdata/test-rbd-multihost-noauth.cfg +++ b/tests/xlconfigdata/test-rbd-multihost-noauth.cfg @@ -22,4 +22,4 @@ parallel =3D "none" serial =3D "none" builder =3D "hvm" boot =3D "d" -disk =3D [ "format=3Draw,vdev=3Dhda,access=3Drw,backendtype=3Dphy,target= =3D/dev/HostVG/XenGuest2", "format=3Draw,vdev=3Dhdb,access=3Drw,backendtype= =3Dqdisk,target=3Drbd:pool/image:auth_supported=3Dnone:mon_host=3Dmon1.exam= ple.org\\:6321\\;mon2.example.org\\:6322\\;mon3.example.org\\:6322" ] +disk =3D [ "format=3Draw,vdev=3Dhda,access=3Drw,backendtype=3Dphy,target= =3D/dev/HostVG/XenGuest2", "format=3Draw,vdev=3Dhdb,access=3Drw,backendtype= =3Dqdisk,target=3Drbd:pool/image:auth_client_required=3Dnone:mon_host=3Dmon= 1.example.org\\:6321\\;mon2.example.org\\:6322\\;mon3.example.org\\:6322" ] base-commit: 215fab8ab1d912f6b25e60ab4d2ad59000f2eaff --=20 2.54.0