diff options
| author | Jeff Cody <jcody@redhat.com> | 2017-02-27 12:36:46 -0500 |
|---|---|---|
| committer | Jeff Cody <jcody@redhat.com> | 2017-03-01 22:39:25 -0500 |
| commit | 0a55679b4a5061f4d74bdb1a0e81611ba3390b00 (patch) | |
| tree | 56bc7117421afc45725bca3118f698fd54b9ae38 /qapi | |
| parent | 8a47e8eb592b30b010fe143eb2393d4033f0a79c (diff) | |
| download | qemu-0a55679b4a5061f4d74bdb1a0e81611ba3390b00.tar.gz | |
block/rbd: add support for 'mon_host', 'auth_supported' via QAPI
This adds support for three additional options that may be specified
by QAPI in blockdev-add:
server: host, port
auth method: either 'cephx' or 'none'
The "server" and "auth-supported" QAPI parameters are arrays. To conform
with the rados API, the array items are join as a single string with a ';'
character as a delimiter when setting the configuration values.
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/block-core.json | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json index 803edc3cf8..2e01a9524e 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2666,6 +2666,28 @@ '*header-digest': 'IscsiHeaderDigest', '*timeout': 'int' } } + +## +# @RbdAuthSupport: +# +# An enumeration of RBD auth support +# +# Since: 2.9 +## +{ 'enum': 'RbdAuthSupport', + 'data': [ 'cephx', 'none' ] } + + +## +# @RbdAuthMethod: +# +# An enumeration of rados auth_supported types +# +# Since: 2.9 +## +{ 'struct': 'RbdAuthMethod', + 'data': { 'auth': 'RbdAuthSupport' } } + ## # @BlockdevOptionsRbd: # @@ -2681,6 +2703,11 @@ # # @user: #optional Ceph id name. # +# @server: #optional Monitor host address and port. This maps +# to the "mon_host" Ceph option. +# +# @auth-supported: #optional Authentication supported. +# # @password-secret: #optional The ID of a QCryptoSecret object providing # the password for the login. # @@ -2692,6 +2719,8 @@ '*conf': 'str', '*snapshot': 'str', '*user': 'str', + '*server': ['InetSocketAddress'], + '*auth-supported': ['RbdAuthMethod'], '*password-secret': 'str' } } ## |