提交 ca2765a2 编写于 作者: W Wido den Hollander 提交者: Cole Robinson

qemu: Always set auth_supported for Ceph disks.

Recently the Ceph project defaulted auth_supported from 'none' to 'cephx'.

When no auth information was set for Ceph disks this would lead to librados defaulting to
'cephx', but there would be no additional authorization information.

We now explicitly set auth_supported to none when passing down arguments to Qemu.
Signed-off-by: NWido den Hollander <wido@widodh.nl>
(cherry picked from commit ccb94785)

(crobinso: Add Wido to AUTHORS)
上级 b1b449b3
...@@ -240,6 +240,7 @@ Patches have also been contributed by: ...@@ -240,6 +240,7 @@ Patches have also been contributed by:
Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com> Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
Thang Pham <thang.pham@us.ibm.com> Thang Pham <thang.pham@us.ibm.com>
Eiichi Tsukata <eiichi.tsukata.xh@hitachi.com> Eiichi Tsukata <eiichi.tsukata.xh@hitachi.com>
Wido den Hollander <wido@widodh.nl>
[....send patches to get your name here....] [....send patches to get your name here....]
......
...@@ -1775,6 +1775,8 @@ qemuBuildRBDString(virConnectPtr conn, ...@@ -1775,6 +1775,8 @@ qemuBuildRBDString(virConnectPtr conn,
disk->auth.username); disk->auth.username);
goto error; goto error;
} }
} else {
virBufferAddLit(opt, ":auth_supported=none");
} }
if (disk->nhosts > 0) { if (disk->nhosts > 0) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册