Skip to content

fix: use auth_client_required instead of removed auth_supported for RBD #13991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
waterWang wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −5
Open

fix: use auth_client_required instead of removed auth_supported for RBD #13991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDisk.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ public static String RBDStringBuilder(KVMStoragePool storagePool, String image)
rbdOpts += ":mon_host=" + composeOptionForMonHosts(monHost, monPort);

if (authUserName == null) {
rbdOpts += ":auth_supported=none";
rbdOpts += ":auth_client_required=none";
} else {
rbdOpts += ":auth_supported=cephx";
rbdOpts += ":auth_client_required=cephx";
rbdOpts += ":id=" + authUserName;
rbdOpts += ":key=" + authSecret;
}
Expand Down
6 changes: 3 additions & 3 deletions ...s/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMPhysicalDiskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public void testRBDStringBuilder() {
Mockito.doReturn(authUserName).when(kvmStoragePoolMock).getAuthUserName();
Mockito.doReturn(authSecret).when(kvmStoragePoolMock).getAuthSecret();

String expected = "rbd:volume1:mon_host=ceph-monitor\\:8000:auth_supported=cephx:id=admin:key=supersecret:rbd_default_format=2:client_mount_timeout=30";
String expected = "rbd:volume1:mon_host=ceph-monitor\\:8000:auth_client_required=cephx:id=admin:key=supersecret:rbd_default_format=2:client_mount_timeout=30";
String result = KVMPhysicalDisk.RBDStringBuilder(kvmStoragePoolMock, "volume1");

Assert.assertEquals(expected, result);
Expand All @@ -62,7 +62,7 @@ public void testRBDStringBuilder2() {

String expected = "rbd:volume1:" +
"mon_host=ceph-monitor1\\:3300\\;ceph-monitor2\\:3300\\;ceph-monitor3\\:3300:" +
"auth_supported=cephx:id=admin:key=supersecret:rbd_default_format=2:client_mount_timeout=30";
"auth_client_required=cephx:id=admin:key=supersecret:rbd_default_format=2:client_mount_timeout=30";
String actualResult = KVMPhysicalDisk.RBDStringBuilder(kvmStoragePoolMock, "volume1");

Assert.assertEquals(expected, actualResult);
Expand All @@ -80,7 +80,7 @@ public void testRBDStringBuilder3() {

String expected = "rbd:volume1:" +
"mon_host=[fc00\\:1234\\:\\:1]\\:3300\\;[fc00\\:1234\\:\\:2]\\:3300\\;[fc00\\:1234\\:\\:3]\\:3300:" +
"auth_supported=cephx:id=admin:key=supersecret:rbd_default_format=2:client_mount_timeout=30";
"auth_client_required=cephx:id=admin:key=supersecret:rbd_default_format=2:client_mount_timeout=30";
String actualResult = KVMPhysicalDisk.RBDStringBuilder(kvmStoragePoolMock, "volume1");

Assert.assertEquals(expected, actualResult);
Expand Down
Loading