From mboxrd@z Thu Jan 1 00:00:00 1970 From: Josh Durgin Subject: Re: [libvirt] [RFC PATCH v3 1/4] secret: add Ceph secret type Date: Fri, 28 Oct 2011 11:47:09 -0700 Message-ID: <4EAAF8AD.8040701@dreamhost.com> References: <539f3129dfd5d3f80a06837b63dfc5d355f1acc8.1319072460.git.josh.durgin@dreamhost.com> <20111027082845.GA20878@redhat.com> <4EAAE960.9010308@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from mail.hq.newdream.net ([66.33.206.127]:37722 "EHLO mail.hq.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932668Ab1J1SrK (ORCPT ); Fri, 28 Oct 2011 14:47:10 -0400 In-Reply-To: <4EAAE960.9010308@redhat.com> Sender: ceph-devel-owner@vger.kernel.org List-ID: To: Eric Blake Cc: "Daniel P. Berrange" , libvir-list@redhat.com, ceph-devel@vger.kernel.org On 10/28/2011 10:41 AM, Eric Blake wrote: > On 10/27/2011 02:28 AM, Daniel P. Berrange wrote: >> On Thu, Oct 20, 2011 at 11:01:24AM -0700, Josh Durgin wrote: >>> From: Sage Weil >>> >>> Add a new secret type to store a Ceph authentication key. The name >>> is simply an identifier for easy human reference. >>> >>> The xml looks like this: >>> >>> >>> 0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f >>> >>> mycluster_admin >>> >>> >>> >>> Signed-off-by: Sage Weil >>> Signed-off-by: Josh Durgin >>> --- >>> docs/schemas/secret.rng | 10 ++++++++++ > > Missing docs/formatsecret.html.in changes to document this, but I think > I managed. > >>> include/libvirt/libvirt.h.in | 3 +++ >>> src/conf/secret_conf.c | 23 ++++++++++++++++++++++- >>> src/conf/secret_conf.h | 1 + >>> src/secret/secret_driver.c | 8 ++++++++ >>> 5 files changed, 44 insertions(+), 1 deletions(-) >> >> ACK > > I'm adding this, and pushing: Thanks, I'm not sure why the mail didn't go through to the libvirt list. It looks like there's a break missing in the pushed version though: diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index fa80888..a51fc69 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -55,6 +55,7 @@ virSecretDefFree(virSecretDefPtr def) case VIR_SECRET_USAGE_TYPE_CEPH: VIR_FREE(def->usage.ceph); + break; default: VIR_ERROR(_("unexpected secret usage type %d"), def->usage_type); I'll send an updated version of the other patches shortly. > > diff --git i/docs/formatsecret.html.in w/docs/formatsecret.html.in > index 63a1f2a..01aff2d 100644 > --- i/docs/formatsecret.html.in > +++ w/docs/formatsecret.html.in > @@ -39,8 +39,8 @@ >
> Specifies what this secret is used for. A mandatory > type attribute specifies the usage category, currently > - only volume is defined. Specific usage categories are > - described below. > + only volume and ceph are defined. > + Specific usage categories are described below. >
> > > @@ -54,6 +54,18 @@ > this secret is associated with. >

> > +

Usage type "ceph"

> + > +

> + This secret is associated with a Ceph RBD (rados block device). > + The <usage type='ceph'> element must contain > + a single name element that specifies a usage name > + for the secret. The Ceph secret can then be used by UUID or by > + this usage name via the <auth> element of > + a disk > + device. Since 0.9.7. > +

> + >

Example

> > 
>
>