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: Wido den Hollander <wido@widodh.nl>
(cherry picked from commit ccb94785007d33365d49dd566e194eb0a022148d)

(crobinso: Add Wido to AUTHORS)

diff --git a/AUTHORS b/AUTHORS
index 57e124d5820893eeef26c2f4be3d826afe686825..76fa3cd2d82350b87cb266506b034f4f858c277b 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -240,6 +240,7 @@ Patches have also been contributed by:
   Viktor Mihajlovski   <mihajlov@linux.vnet.ibm.com>
   Thang Pham           <thang.pham@us.ibm.com>
   Eiichi Tsukata       <eiichi.tsukata.xh@hitachi.com>
+  Wido den Hollander   <wido@widodh.nl>
 
   [....send patches to get your name here....]
 

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index af5ff5b929d6cc859eb22472447c60d248218f6c..4d518b23fc53ec44e6daa6c4d87c2cf2905179fa 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1775,6 +1775,8 @@ qemuBuildRBDString(virConnectPtr conn,
                             disk->auth.username);
             goto error;
         }
+    } else {
+        virBufferAddLit(opt, ":auth_supported=none");
     }
 
     if (disk->nhosts > 0) {