提交 577d8c9a 编写于 作者: M Markus Armbruster 提交者: Jeff Cody

rbd: Revert -blockdev parameter password-secret

This reverts a part of commit 8a47e8eb.  We're having second thoughts
on the QAPI schema (and thus the external interface), and haven't
reached consensus, yet.  Issues include:

* BlockdevOptionsRbd member @password-secret isn't actually a
  password, it's a key generated by Ceph.

* We're not sure where member @password-secret belongs (see the
  previous commit).

* How @password-secret interacts with settings from a configuration
  file specified with @conf is undocumented.

Let's avoid painting ourselves into a corner now, and revert the
feature for 2.9.

Note that users can still configure an authentication key with a
configuration file.  They probably do that anyway if they use Ceph
outside QEMU as well.
Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
Reviewed-by: NMax Reitz <mreitz@redhat.com>
Reviewed-by: NEric Blake <eblake@redhat.com>
Reviewed-by: NJeff Cody <jcody@redhat.com>
Message-id: 1490691368-32099-10-git-send-email-armbru@redhat.com
Signed-off-by: NJeff Cody <jcody@redhat.com>
上级 464444fc
......@@ -2618,9 +2618,6 @@
# @server: Monitor host address and port. This maps
# to the "mon_host" Ceph option.
#
# @password-secret: The ID of a QCryptoSecret object providing
# the password for the login.
#
# Since: 2.9
##
{ 'struct': 'BlockdevOptionsRbd',
......@@ -2629,8 +2626,7 @@
'*conf': 'str',
'*snapshot': 'str',
'*user': 'str',
'*server': ['InetSocketAddressBase'],
'*password-secret': 'str' } }
'*server': ['InetSocketAddressBase'] } }
##
# @BlockdevOptionsSheepdog:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册