summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2006-03-28 16:21:33 +0000
committerNarayan Desai <desai@mcs.anl.gov>2006-03-28 16:21:33 +0000
commite3ff37b12ad69f4cd4da7ca69a84873d9b8145fd (patch)
treea87dcbeefd145caeab543dfd38239681999a2386
parentfea257973f7be1ad01405e1cfdab0ac7295656ff (diff)
downloadbcfg2-e3ff37b12ad69f4cd4da7ca69a84873d9b8145fd.tar.gz
bcfg2-e3ff37b12ad69f4cd4da7ca69a84873d9b8145fd.tar.bz2
bcfg2-e3ff37b12ad69f4cd4da7ca69a84873d9b8145fd.zip
* Fix package list schema to allow hosts and nested groups
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1812 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--schemas/pkglist.xsd8
1 files changed, 5 insertions, 3 deletions
diff --git a/schemas/pkglist.xsd b/schemas/pkglist.xsd
index d262963ee..660fe3a7d 100644
--- a/schemas/pkglist.xsd
+++ b/schemas/pkglist.xsd
@@ -16,17 +16,19 @@
<xsd:attribute type='xsd:string' name='simplefile'/>
</xsd:complexType>
- <xsd:complexType name='GroupType'>
+ <xsd:complexType name='ContainerType'>
<xsd:choice minOccurs='0' maxOccurs='unbounded'>
<xsd:element name='Package' type='PackageType'/>
+ <xsd:element name='Group' type='ContainerType'/>
+ <xsd:element name='Host' type='ContainerType'/>
</xsd:choice>
- <xsd:attribute type='xsd:string' name='name' use='required'/>
+ <xsd:attribute name='name' type='xsd:string'/>
</xsd:complexType>
<xsd:element name='PackageList'>
<xsd:complexType>
<xsd:choice minOccurs='0' maxOccurs='unbounded'>
- <xsd:element name='Group' type='GroupType'/>
+ <xsd:element name='Group' type='ContainerType'/>
</xsd:choice>
<xsd:attribute name='priority' type='xsd:integer' use='required'/>
<xsd:attribute name='type' type='xsd:string' use='required'/>