diff options
| author | Markus Armbruster <armbru@redhat.com> | 2017-03-28 10:56:07 +0200 |
|---|---|---|
| committer | Jeff Cody <jcody@redhat.com> | 2017-03-28 10:01:21 -0400 |
| commit | 577d8c9a811fc697b4cc68fbbe5c509b028e0768 (patch) | |
| tree | aa500ab181d5a3b86d419b0a8971eebbb484e8e7 | |
| parent | 464444fcc161284ac0e743b99251debc297d5236 (diff) | |
| download | qemu-577d8c9a811fc697b4cc68fbbe5c509b028e0768.tar.gz | |
rbd: Revert -blockdev parameter password-secret
This reverts a part of commit 8a47e8e. 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: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Message-id: 1490691368-32099-10-git-send-email-armbru@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
| -rw-r--r-- | qapi/block-core.json | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json index 6a7ca0b974..78eb8fb5aa 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -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: |