| Message ID | 08786526aec147544588ab3e885a984e7d0d1c69.1488180142.git.jcody@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Mon, Feb 27, 2017 at 02:30:41AM -0500, Jeff Cody wrote: > Signed-off-by: Jeff Cody <jcody@redhat.com> > --- > qapi/block-core.json | 47 ++++++++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 44 insertions(+), 3 deletions(-) > > diff --git a/qapi/block-core.json b/qapi/block-core.json > index 5f82d35..08a1419 100644 > --- a/qapi/block-core.json > +++ b/qapi/block-core.json > @@ -2111,6 +2111,7 @@ > # @replication: Since 2.8 > # @ssh: Since 2.8 > # @iscsi: Since 2.9 > +# @rbd: Since 2.9 > # > # Since: 2.0 > ## > @@ -2120,7 +2121,7 @@ > 'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs', > 'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed', > 'quorum', 'raw', 'replication', 'ssh', 'vdi', 'vhdx', 'vmdk', > - 'vpc', 'vvfat' ] } > + 'vpc', 'vvfat', 'rbd' ] } > > ## > # @BlockdevOptionsFile: > @@ -2376,7 +2377,6 @@ > 'path': 'str', > '*user': 'str' } } > > - > ## > # @BlkdebugEvent: > # > @@ -2666,6 +2666,47 @@ > '*timeout': 'int' } } > > ## > +# @BlockdevOptionsRbd: > +# > +# @pool: Ceph pool name > +# > +# @image: Image name in the Ceph pool > +# > +# @conf: # optional path to Ceph configuration file. Values > +# in the configuration file will be overridden by > +# options specified via QAPI. > +# > +# @snapshot: #optional Ceph snapshot name > +# > +# @rbd-id: #optional Ceph id name > +# > +# @password-secret: #optional The ID of a QCryptoSecret object providing > +# the password for the login. > +# > +# @keyvalue-pairs: #optional string containing key/value pairs for > +# additional Ceph configuration, not including "id" or "conf" > +# options. This can be used to specify any of the options > +# that Ceph supports. The format is of the form: > +# key1=value1:key2=value2:[...] > +# > +# Special characters such as ":" and "=" can be escaped > +# with a '\' character, which means the QAPI needs an > +# extra '\' character to pass the needed escape character. > +# For example: > +# "keyvalue-pairs": "mon_host=127.0.0.1\\:6321" > +# This is the key / value pair issue mentioned in the cover letter. Encoding all the options as a string like this is ugly. What is the preference on how to handle these via QAPI, when the actual key and value pairs could be anything? Talking with Markus on IRC, one option he mentioned was an array of a generic struct of 'key' and 'value' pairs. Do the libvirt folks have any interface preferences here? > +# Since: 2.9 > +## > +{ 'struct': 'BlockdevOptionsRbd', > + 'data': { 'pool': 'str', > + 'image': 'str', > + '*conf': 'str', > + '*snapshot': 'str', > + '*rbd-id': 'str', > + '*password-secret': 'str', > + '*keyvalue-pairs': 'str' } } > + > +## > # @ReplicationMode: > # > # An enumeration of replication modes. > @@ -2863,7 +2904,7 @@ > 'qed': 'BlockdevOptionsGenericCOWFormat', > 'quorum': 'BlockdevOptionsQuorum', > 'raw': 'BlockdevOptionsRaw', > -# TODO rbd: Wait for structured options > + 'rbd': 'BlockdevOptionsRbd', > 'replication':'BlockdevOptionsReplication', > # TODO sheepdog: Wait for structured options > 'ssh': 'BlockdevOptionsSsh', > -- > 2.9.3 >
On Mon, Feb 27, 2017 at 02:36:13AM -0500, Jeff Cody wrote: > On Mon, Feb 27, 2017 at 02:30:41AM -0500, Jeff Cody wrote: > > Signed-off-by: Jeff Cody <jcody@redhat.com> > > --- > > qapi/block-core.json | 47 ++++++++++++++++++++++++++++++++++++++++++++--- > > 1 file changed, 44 insertions(+), 3 deletions(-) > > > > diff --git a/qapi/block-core.json b/qapi/block-core.json > > index 5f82d35..08a1419 100644 > > --- a/qapi/block-core.json > > +++ b/qapi/block-core.json > > @@ -2111,6 +2111,7 @@ > > # @replication: Since 2.8 > > # @ssh: Since 2.8 > > # @iscsi: Since 2.9 > > +# @rbd: Since 2.9 > > # > > # Since: 2.0 > > ## > > @@ -2120,7 +2121,7 @@ > > 'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs', > > 'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed', > > 'quorum', 'raw', 'replication', 'ssh', 'vdi', 'vhdx', 'vmdk', > > - 'vpc', 'vvfat' ] } > > + 'vpc', 'vvfat', 'rbd' ] } > > > > ## > > # @BlockdevOptionsFile: > > @@ -2376,7 +2377,6 @@ > > 'path': 'str', > > '*user': 'str' } } > > > > - > > ## > > # @BlkdebugEvent: > > # > > @@ -2666,6 +2666,47 @@ > > '*timeout': 'int' } } > > > > ## > > +# @BlockdevOptionsRbd: > > +# > > +# @pool: Ceph pool name > > +# > > +# @image: Image name in the Ceph pool > > +# > > +# @conf: # optional path to Ceph configuration file. Values > > +# in the configuration file will be overridden by > > +# options specified via QAPI. > > +# > > +# @snapshot: #optional Ceph snapshot name > > +# > > +# @rbd-id: #optional Ceph id name > > +# > > +# @password-secret: #optional The ID of a QCryptoSecret object providing > > +# the password for the login. > > +# > > +# @keyvalue-pairs: #optional string containing key/value pairs for > > +# additional Ceph configuration, not including "id" or "conf" > > +# options. This can be used to specify any of the options > > +# that Ceph supports. The format is of the form: > > +# key1=value1:key2=value2:[...] > > +# > > +# Special characters such as ":" and "=" can be escaped > > +# with a '\' character, which means the QAPI needs an > > +# extra '\' character to pass the needed escape character. > > +# For example: > > +# "keyvalue-pairs": "mon_host=127.0.0.1\\:6321" > > +# > > This is the key / value pair issue mentioned in the cover letter. Encoding > all the options as a string like this is ugly. What is the preference on > how to handle these via QAPI, when the actual key and value pairs could be > anything? Talking with Markus on IRC, one option he mentioned was an array > of a generic struct of 'key' and 'value' pairs. > > Do the libvirt folks have any interface preferences here? IMHO, we should formally model each option that we need to be able to provide and *not* provide any generic passthrough feature in QAPI. Particularly for the server hostname/port, we should have the same QAPI modelling approach that we did for other network protocols. Regards, Daniel
On Mon, Feb 27, 2017 at 09:31:21AM +0000, Daniel P. Berrange wrote: > On Mon, Feb 27, 2017 at 02:36:13AM -0500, Jeff Cody wrote: > > On Mon, Feb 27, 2017 at 02:30:41AM -0500, Jeff Cody wrote: > > > Signed-off-by: Jeff Cody <jcody@redhat.com> > > > --- > > > qapi/block-core.json | 47 ++++++++++++++++++++++++++++++++++++++++++++--- > > > 1 file changed, 44 insertions(+), 3 deletions(-) > > > > > > diff --git a/qapi/block-core.json b/qapi/block-core.json > > > index 5f82d35..08a1419 100644 > > > --- a/qapi/block-core.json > > > +++ b/qapi/block-core.json > > > @@ -2111,6 +2111,7 @@ > > > # @replication: Since 2.8 > > > # @ssh: Since 2.8 > > > # @iscsi: Since 2.9 > > > +# @rbd: Since 2.9 > > > # > > > # Since: 2.0 > > > ## > > > @@ -2120,7 +2121,7 @@ > > > 'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs', > > > 'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed', > > > 'quorum', 'raw', 'replication', 'ssh', 'vdi', 'vhdx', 'vmdk', > > > - 'vpc', 'vvfat' ] } > > > + 'vpc', 'vvfat', 'rbd' ] } > > > > > > ## > > > # @BlockdevOptionsFile: > > > @@ -2376,7 +2377,6 @@ > > > 'path': 'str', > > > '*user': 'str' } } > > > > > > - > > > ## > > > # @BlkdebugEvent: > > > # > > > @@ -2666,6 +2666,47 @@ > > > '*timeout': 'int' } } > > > > > > ## > > > +# @BlockdevOptionsRbd: > > > +# > > > +# @pool: Ceph pool name > > > +# > > > +# @image: Image name in the Ceph pool > > > +# > > > +# @conf: # optional path to Ceph configuration file. Values > > > +# in the configuration file will be overridden by > > > +# options specified via QAPI. > > > +# > > > +# @snapshot: #optional Ceph snapshot name > > > +# > > > +# @rbd-id: #optional Ceph id name > > > +# > > > +# @password-secret: #optional The ID of a QCryptoSecret object providing > > > +# the password for the login. > > > +# > > > +# @keyvalue-pairs: #optional string containing key/value pairs for > > > +# additional Ceph configuration, not including "id" or "conf" > > > +# options. This can be used to specify any of the options > > > +# that Ceph supports. The format is of the form: > > > +# key1=value1:key2=value2:[...] > > > +# > > > +# Special characters such as ":" and "=" can be escaped > > > +# with a '\' character, which means the QAPI needs an > > > +# extra '\' character to pass the needed escape character. > > > +# For example: > > > +# "keyvalue-pairs": "mon_host=127.0.0.1\\:6321" > > > +# > > > > This is the key / value pair issue mentioned in the cover letter. Encoding > > all the options as a string like this is ugly. What is the preference on > > how to handle these via QAPI, when the actual key and value pairs could be > > anything? Talking with Markus on IRC, one option he mentioned was an array > > of a generic struct of 'key' and 'value' pairs. > > > > Do the libvirt folks have any interface preferences here? > > IMHO, we should formally model each option that we need to be able to provide > and *not* provide any generic passthrough feature in QAPI. > > Particularly for the server hostname/port, we should have the same QAPI > modelling approach that we did for other network protocols. > > That is a sane position to take, but the problem is I really have no idea all the options to include or not include here. However, maybe it doesn't matter, at least for 2.9 - for the QAPI command, we could drop the extra arguments completely (i.e., just drop the keyvalue-pairs argument, above). The extra options could still be set via a config file passed in via 'conf', and in release > 2.9 we can gradually (or not-so-gradually) add in additional options directly supported via QAPI. The filename parsing would remain the same, for backwards compatibility, of course. Does this sound reasonable to you? -Jeff
On Mon, Feb 27, 2017 at 08:18:59AM -0500, Jeff Cody wrote: > On Mon, Feb 27, 2017 at 09:31:21AM +0000, Daniel P. Berrange wrote: > > On Mon, Feb 27, 2017 at 02:36:13AM -0500, Jeff Cody wrote: > > > On Mon, Feb 27, 2017 at 02:30:41AM -0500, Jeff Cody wrote: > > > > Signed-off-by: Jeff Cody <jcody@redhat.com> > > > > --- > > > > qapi/block-core.json | 47 ++++++++++++++++++++++++++++++++++++++++++++--- > > > > 1 file changed, 44 insertions(+), 3 deletions(-) > > > > > > > > diff --git a/qapi/block-core.json b/qapi/block-core.json > > > > index 5f82d35..08a1419 100644 > > > > --- a/qapi/block-core.json > > > > +++ b/qapi/block-core.json > > > > @@ -2111,6 +2111,7 @@ > > > > # @replication: Since 2.8 > > > > # @ssh: Since 2.8 > > > > # @iscsi: Since 2.9 > > > > +# @rbd: Since 2.9 > > > > # > > > > # Since: 2.0 > > > > ## > > > > @@ -2120,7 +2121,7 @@ > > > > 'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs', > > > > 'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed', > > > > 'quorum', 'raw', 'replication', 'ssh', 'vdi', 'vhdx', 'vmdk', > > > > - 'vpc', 'vvfat' ] } > > > > + 'vpc', 'vvfat', 'rbd' ] } > > > > > > > > ## > > > > # @BlockdevOptionsFile: > > > > @@ -2376,7 +2377,6 @@ > > > > 'path': 'str', > > > > '*user': 'str' } } > > > > > > > > - > > > > ## > > > > # @BlkdebugEvent: > > > > # > > > > @@ -2666,6 +2666,47 @@ > > > > '*timeout': 'int' } } > > > > > > > > ## > > > > +# @BlockdevOptionsRbd: > > > > +# > > > > +# @pool: Ceph pool name > > > > +# > > > > +# @image: Image name in the Ceph pool > > > > +# > > > > +# @conf: # optional path to Ceph configuration file. Values > > > > +# in the configuration file will be overridden by > > > > +# options specified via QAPI. > > > > +# > > > > +# @snapshot: #optional Ceph snapshot name > > > > +# > > > > +# @rbd-id: #optional Ceph id name > > > > +# > > > > +# @password-secret: #optional The ID of a QCryptoSecret object providing > > > > +# the password for the login. > > > > +# > > > > +# @keyvalue-pairs: #optional string containing key/value pairs for > > > > +# additional Ceph configuration, not including "id" or "conf" > > > > +# options. This can be used to specify any of the options > > > > +# that Ceph supports. The format is of the form: > > > > +# key1=value1:key2=value2:[...] > > > > +# > > > > +# Special characters such as ":" and "=" can be escaped > > > > +# with a '\' character, which means the QAPI needs an > > > > +# extra '\' character to pass the needed escape character. > > > > +# For example: > > > > +# "keyvalue-pairs": "mon_host=127.0.0.1\\:6321" > > > > +# > > > > > > This is the key / value pair issue mentioned in the cover letter. Encoding > > > all the options as a string like this is ugly. What is the preference on > > > how to handle these via QAPI, when the actual key and value pairs could be > > > anything? Talking with Markus on IRC, one option he mentioned was an array > > > of a generic struct of 'key' and 'value' pairs. > > > > > > Do the libvirt folks have any interface preferences here? > > > > IMHO, we should formally model each option that we need to be able to provide > > and *not* provide any generic passthrough feature in QAPI. > > > > Particularly for the server hostname/port, we should have the same QAPI > > modelling approach that we did for other network protocols. > > > > > > That is a sane position to take, but the problem is I really have no idea > all the options to include or not include here. Libvirt relies on the following - id - to provide the username - mon_host - to provide the list of host+ports - auth_supported - to provide the list of authentication schemes to try - conf - to proide the ceph config file > However, maybe it doesn't matter, at least for 2.9 - for the QAPI command, > we could drop the extra arguments completely (i.e., just drop the > keyvalue-pairs argument, above). The extra options could still be set via a > config file passed in via 'conf', and in release > 2.9 we can gradually (or > not-so-gradually) add in additional options directly supported via QAPI. > > The filename parsing would remain the same, for backwards compatibility, of > course. > > Does this sound reasonable to you? If we support the pieces libvirt needs, then I've no objection to dropping the rest. Regards, Daniel
On Mon, Feb 27, 2017 at 01:30:46PM +0000, Daniel P. Berrange wrote: > On Mon, Feb 27, 2017 at 08:18:59AM -0500, Jeff Cody wrote: > > On Mon, Feb 27, 2017 at 09:31:21AM +0000, Daniel P. Berrange wrote: > > > On Mon, Feb 27, 2017 at 02:36:13AM -0500, Jeff Cody wrote: > > > > On Mon, Feb 27, 2017 at 02:30:41AM -0500, Jeff Cody wrote: > > > > > Signed-off-by: Jeff Cody <jcody@redhat.com> > > > > > --- > > > > > qapi/block-core.json | 47 ++++++++++++++++++++++++++++++++++++++++++++--- > > > > > 1 file changed, 44 insertions(+), 3 deletions(-) > > > > > > > > > > diff --git a/qapi/block-core.json b/qapi/block-core.json > > > > > index 5f82d35..08a1419 100644 > > > > > --- a/qapi/block-core.json > > > > > +++ b/qapi/block-core.json > > > > > @@ -2111,6 +2111,7 @@ > > > > > # @replication: Since 2.8 > > > > > # @ssh: Since 2.8 > > > > > # @iscsi: Since 2.9 > > > > > +# @rbd: Since 2.9 > > > > > # > > > > > # Since: 2.0 > > > > > ## > > > > > @@ -2120,7 +2121,7 @@ > > > > > 'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs', > > > > > 'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed', > > > > > 'quorum', 'raw', 'replication', 'ssh', 'vdi', 'vhdx', 'vmdk', > > > > > - 'vpc', 'vvfat' ] } > > > > > + 'vpc', 'vvfat', 'rbd' ] } > > > > > > > > > > ## > > > > > # @BlockdevOptionsFile: > > > > > @@ -2376,7 +2377,6 @@ > > > > > 'path': 'str', > > > > > '*user': 'str' } } > > > > > > > > > > - > > > > > ## > > > > > # @BlkdebugEvent: > > > > > # > > > > > @@ -2666,6 +2666,47 @@ > > > > > '*timeout': 'int' } } > > > > > > > > > > ## > > > > > +# @BlockdevOptionsRbd: > > > > > +# > > > > > +# @pool: Ceph pool name > > > > > +# > > > > > +# @image: Image name in the Ceph pool > > > > > +# > > > > > +# @conf: # optional path to Ceph configuration file. Values > > > > > +# in the configuration file will be overridden by > > > > > +# options specified via QAPI. > > > > > +# > > > > > +# @snapshot: #optional Ceph snapshot name > > > > > +# > > > > > +# @rbd-id: #optional Ceph id name > > > > > +# > > > > > +# @password-secret: #optional The ID of a QCryptoSecret object providing > > > > > +# the password for the login. > > > > > +# > > > > > +# @keyvalue-pairs: #optional string containing key/value pairs for > > > > > +# additional Ceph configuration, not including "id" or "conf" > > > > > +# options. This can be used to specify any of the options > > > > > +# that Ceph supports. The format is of the form: > > > > > +# key1=value1:key2=value2:[...] > > > > > +# > > > > > +# Special characters such as ":" and "=" can be escaped > > > > > +# with a '\' character, which means the QAPI needs an > > > > > +# extra '\' character to pass the needed escape character. > > > > > +# For example: > > > > > +# "keyvalue-pairs": "mon_host=127.0.0.1\\:6321" > > > > > +# > > > > > > > > This is the key / value pair issue mentioned in the cover letter. Encoding > > > > all the options as a string like this is ugly. What is the preference on > > > > how to handle these via QAPI, when the actual key and value pairs could be > > > > anything? Talking with Markus on IRC, one option he mentioned was an array > > > > of a generic struct of 'key' and 'value' pairs. > > > > > > > > Do the libvirt folks have any interface preferences here? > > > > > > IMHO, we should formally model each option that we need to be able to provide > > > and *not* provide any generic passthrough feature in QAPI. > > > > > > Particularly for the server hostname/port, we should have the same QAPI > > > modelling approach that we did for other network protocols. > > > > > > > > > > That is a sane position to take, but the problem is I really have no idea > > all the options to include or not include here. > > Libvirt relies on the following > > - id - to provide the username > - mon_host - to provide the list of host+ports > - auth_supported - to provide the list of authentication schemes to try > - conf - to proide the ceph config file > > > > However, maybe it doesn't matter, at least for 2.9 - for the QAPI command, > > we could drop the extra arguments completely (i.e., just drop the > > keyvalue-pairs argument, above). The extra options could still be set via a > > config file passed in via 'conf', and in release > 2.9 we can gradually (or > > not-so-gradually) add in additional options directly supported via QAPI. > > > > The filename parsing would remain the same, for backwards compatibility, of > > course. > > > > Does this sound reasonable to you? > > If we support the pieces libvirt needs, then I've no objection to dropping > the rest. > I'll add in mon_host and auth_supported, then. Then we'll rely on the config file for unlisted options, and revisit new options in later releases. Thanks, Jeff
On Mon, Feb 27, 2017 at 02:30:41AM -0500, Jeff Cody wrote: > Signed-off-by: Jeff Cody <jcody@redhat.com> > --- > qapi/block-core.json | 47 ++++++++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 44 insertions(+), 3 deletions(-) > > diff --git a/qapi/block-core.json b/qapi/block-core.json > index 5f82d35..08a1419 100644 > --- a/qapi/block-core.json > +++ b/qapi/block-core.json > @@ -2111,6 +2111,7 @@ > # @replication: Since 2.8 > # @ssh: Since 2.8 > # @iscsi: Since 2.9 > +# @rbd: Since 2.9 > # > # Since: 2.0 > ## > @@ -2120,7 +2121,7 @@ > 'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs', > 'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed', > 'quorum', 'raw', 'replication', 'ssh', 'vdi', 'vhdx', 'vmdk', > - 'vpc', 'vvfat' ] } > + 'vpc', 'vvfat', 'rbd' ] } > > ## > # @BlockdevOptionsFile: > @@ -2376,7 +2377,6 @@ > 'path': 'str', > '*user': 'str' } } > > - > ## > # @BlkdebugEvent: > # > @@ -2666,6 +2666,47 @@ > '*timeout': 'int' } } > > ## > +# @BlockdevOptionsRbd: > +# > +# @pool: Ceph pool name > +# > +# @image: Image name in the Ceph pool > +# > +# @conf: # optional path to Ceph configuration file. Values > +# in the configuration file will be overridden by > +# options specified via QAPI. > +# > +# @snapshot: #optional Ceph snapshot name > +# > +# @rbd-id: #optional Ceph id name BTW, I think I'd suggest 'user' or 'username' for this, since that is the more common terminology we seem to use for other block drivers > +# > +# @password-secret: #optional The ID of a QCryptoSecret object providing > +# the password for the login. > +# > +# @keyvalue-pairs: #optional string containing key/value pairs for > +# additional Ceph configuration, not including "id" or "conf" > +# options. This can be used to specify any of the options > +# that Ceph supports. The format is of the form: > +# key1=value1:key2=value2:[...] > +# > +# Special characters such as ":" and "=" can be escaped > +# with a '\' character, which means the QAPI needs an > +# extra '\' character to pass the needed escape character. > +# For example: > +# "keyvalue-pairs": "mon_host=127.0.0.1\\:6321" Regards, Daniel
On Mon, Feb 27, 2017 at 01:45:47PM +0000, Daniel P. Berrange wrote: > On Mon, Feb 27, 2017 at 02:30:41AM -0500, Jeff Cody wrote: > > Signed-off-by: Jeff Cody <jcody@redhat.com> > > --- > > qapi/block-core.json | 47 ++++++++++++++++++++++++++++++++++++++++++++--- > > 1 file changed, 44 insertions(+), 3 deletions(-) > > > > diff --git a/qapi/block-core.json b/qapi/block-core.json > > index 5f82d35..08a1419 100644 > > --- a/qapi/block-core.json > > +++ b/qapi/block-core.json > > @@ -2111,6 +2111,7 @@ > > # @replication: Since 2.8 > > # @ssh: Since 2.8 > > # @iscsi: Since 2.9 > > +# @rbd: Since 2.9 > > # > > # Since: 2.0 > > ## > > @@ -2120,7 +2121,7 @@ > > 'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs', > > 'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed', > > 'quorum', 'raw', 'replication', 'ssh', 'vdi', 'vhdx', 'vmdk', > > - 'vpc', 'vvfat' ] } > > + 'vpc', 'vvfat', 'rbd' ] } > > > > ## > > # @BlockdevOptionsFile: > > @@ -2376,7 +2377,6 @@ > > 'path': 'str', > > '*user': 'str' } } > > > > - > > ## > > # @BlkdebugEvent: > > # > > @@ -2666,6 +2666,47 @@ > > '*timeout': 'int' } } > > > > ## > > +# @BlockdevOptionsRbd: > > +# > > +# @pool: Ceph pool name > > +# > > +# @image: Image name in the Ceph pool > > +# > > +# @conf: # optional path to Ceph configuration file. Values > > +# in the configuration file will be overridden by > > +# options specified via QAPI. > > +# > > +# @snapshot: #optional Ceph snapshot name > > +# > > +# @rbd-id: #optional Ceph id name > > BTW, I think I'd suggest 'user' or 'username' for this, since that is the more > common terminology we seem to use for other block drivers > OK, I will go with 'user' instead of 'rbd-id'. I think that fits with the usage terminology in rados_create() documentation as well: int rados_create(rados_t * cluster, const char *const id) [...] Parameters * cluster: where to store the handle * id: the user to connect as (i.e. admin, not client.admin) -Jeff
diff --git a/qapi/block-core.json b/qapi/block-core.json index 5f82d35..08a1419 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2111,6 +2111,7 @@ # @replication: Since 2.8 # @ssh: Since 2.8 # @iscsi: Since 2.9 +# @rbd: Since 2.9 # # Since: 2.0 ## @@ -2120,7 +2121,7 @@ 'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs', 'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'replication', 'ssh', 'vdi', 'vhdx', 'vmdk', - 'vpc', 'vvfat' ] } + 'vpc', 'vvfat', 'rbd' ] } ## # @BlockdevOptionsFile: @@ -2376,7 +2377,6 @@ 'path': 'str', '*user': 'str' } } - ## # @BlkdebugEvent: # @@ -2666,6 +2666,47 @@ '*timeout': 'int' } } ## +# @BlockdevOptionsRbd: +# +# @pool: Ceph pool name +# +# @image: Image name in the Ceph pool +# +# @conf: # optional path to Ceph configuration file. Values +# in the configuration file will be overridden by +# options specified via QAPI. +# +# @snapshot: #optional Ceph snapshot name +# +# @rbd-id: #optional Ceph id name +# +# @password-secret: #optional The ID of a QCryptoSecret object providing +# the password for the login. +# +# @keyvalue-pairs: #optional string containing key/value pairs for +# additional Ceph configuration, not including "id" or "conf" +# options. This can be used to specify any of the options +# that Ceph supports. The format is of the form: +# key1=value1:key2=value2:[...] +# +# Special characters such as ":" and "=" can be escaped +# with a '\' character, which means the QAPI needs an +# extra '\' character to pass the needed escape character. +# For example: +# "keyvalue-pairs": "mon_host=127.0.0.1\\:6321" +# +# Since: 2.9 +## +{ 'struct': 'BlockdevOptionsRbd', + 'data': { 'pool': 'str', + 'image': 'str', + '*conf': 'str', + '*snapshot': 'str', + '*rbd-id': 'str', + '*password-secret': 'str', + '*keyvalue-pairs': 'str' } } + +## # @ReplicationMode: # # An enumeration of replication modes. @@ -2863,7 +2904,7 @@ 'qed': 'BlockdevOptionsGenericCOWFormat', 'quorum': 'BlockdevOptionsQuorum', 'raw': 'BlockdevOptionsRaw', -# TODO rbd: Wait for structured options + 'rbd': 'BlockdevOptionsRbd', 'replication':'BlockdevOptionsReplication', # TODO sheepdog: Wait for structured options 'ssh': 'BlockdevOptionsSsh',
Signed-off-by: Jeff Cody <jcody@redhat.com> --- qapi/block-core.json | 47 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-)