From 1f6cb52d0c43f842766f3ecd6c8286f0f4eed5c2 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 4 Feb 2013 16:20:46 -0500
Subject: Bundler: various changes

* Deprecated use of an explicit name attribute
* Deprecated .genshi bundles
* Minor restructuring for better performance
* bcfg2-lint updates
---
 doc/server/plugins/structures/bundler/index.txt  | 21 +++++++++++----------
 doc/server/plugins/structures/bundler/kernel.txt |  2 +-
 doc/server/plugins/structures/bundler/moab.txt   |  2 +-
 doc/server/plugins/structures/bundler/nagios.txt |  2 +-
 doc/server/plugins/structures/bundler/ntp.txt    |  2 +-
 doc/server/plugins/structures/bundler/snmpd.txt  |  2 +-
 doc/server/plugins/structures/bundler/torque.txt |  2 +-
 doc/server/plugins/structures/bundler/yp.txt     |  2 +-
 8 files changed, 18 insertions(+), 17 deletions(-)

(limited to 'doc/server/plugins/structures/bundler')

diff --git a/doc/server/plugins/structures/bundler/index.txt b/doc/server/plugins/structures/bundler/index.txt
index a19959e66..f6ed1357d 100644
--- a/doc/server/plugins/structures/bundler/index.txt
+++ b/doc/server/plugins/structures/bundler/index.txt
@@ -30,7 +30,7 @@ The following is an annotated copy of a bundle:
 
 .. code-block:: xml
 
-    <Bundle name='ssh' version='2.0'>
+    <Bundle>
       <Path name='/etc/ssh/ssh_host_dsa_key'/>
       <Path name='/etc/ssh/ssh_host_rsa_key'/>
       <Path name='/etc/ssh/ssh_host_dsa_key.pub'/>
@@ -118,13 +118,14 @@ Genshi XML templates allow you to use the `Genshi
 generate a bundle.  Genshi templates can be specified one of two ways:
 
 1. Add an XML-style genshi template to the Bundler directory with a
-   ``.genshi`` and the associated namespace attribute.
-2. Simply add the appropriate namespace attribute to your existing XML
+   ``.genshi`` and the associated namespace attribute.  *This is
+   deprecated as of Bcfg2 1.4.0.*
+2. Add the Genshi namespace to your existing XML
    bundle.
 
 The top-level Bundle tag should look like the following::
 
-    <Bundle name="foo" xmlns:py="http://genshi.edgewall.org/">
+    <Bundle xmlns:py="http://genshi.edgewall.org/">
 
 Several variables are pre-defined inside templates:
 
@@ -184,8 +185,8 @@ in their name. The following template produces such a config file entry.
 
 .. code-block:: xml
 
-    <Bundle name='foo'  xmlns:py="http://genshi.edgewall.org/">
-        <Path name='/etc/package-${metadata.hostname}'/>
+    <Bundle xmlns:py="http://genshi.edgewall.org/">
+      <Path name='/etc/package-${metadata.hostname}'/>
     </Bundle>
 
 Depending on the circumstance, these configuration files can either be
@@ -199,7 +200,7 @@ and returns them in a newline delimited string.
 
 .. code-block:: xml
 
-    <Bundle name="networkinterfaces" xmlns:py="http://genshi.edgewall.org/">
+    <Bundle xmlns:py="http://genshi.edgewall.org/">
         <?python
           files = metadata.Probes["getmacs"].split("\n")
         ?>
@@ -219,7 +220,7 @@ if declaration.
 
 .. code-block:: xml
 
-    <Bundle name='bacula' xmlns:py="http://genshi.edgewall.org/">
+    <Bundle xmlns:py="http://genshi.edgewall.org/">
          <Path name="/etc/bacula/bconsole.conf"/>
          <Path name="/etc/bacula/bacula-fd.conf"/>
          <Path name="/etc/bacula/bacula-sd.conf"/>
@@ -231,7 +232,7 @@ or alternately
 
 .. code-block:: xml
 
-    <Bundle name='bacula' xmlns:py="http://genshi.edgewall.org/">
+    <Bundle xmlns:py="http://genshi.edgewall.org/">
          <Path name="/etc/bacula/bconsole.conf"/>
          <Path name="/etc/bacula/bacula-fd.conf"/>
          <Path name="/etc/bacula/bacula-sd.conf"/>
@@ -244,7 +245,7 @@ or yet another way
 
 .. code-block:: xml
 
-    <Bundle name='bacula' xmlns:py="http://genshi.edgewall.org/">
+    <Bundle xmlns:py="http://genshi.edgewall.org/">
         <Path name="/etc/bacula/bconsole.conf"/>
         <Path name="/etc/bacula/bacula-fd.conf"/>
         <Path name="/etc/bacula/bacula-sd.conf"/>
diff --git a/doc/server/plugins/structures/bundler/kernel.txt b/doc/server/plugins/structures/bundler/kernel.txt
index c6aa5e3f3..e61d21476 100644
--- a/doc/server/plugins/structures/bundler/kernel.txt
+++ b/doc/server/plugins/structures/bundler/kernel.txt
@@ -21,7 +21,7 @@ some of which might be better than this one. Feel free to hack as needed.
 
 .. code-block:: xml
 
-    <Bundle name='kernel' version='2.0'>
+    <Bundle>
       <Group name='sles8'>
         <!-- =================== ia32 ==================== -->
         <Group name='ia32'>
diff --git a/doc/server/plugins/structures/bundler/moab.txt b/doc/server/plugins/structures/bundler/moab.txt
index e0d96be74..8f747376a 100644
--- a/doc/server/plugins/structures/bundler/moab.txt
+++ b/doc/server/plugins/structures/bundler/moab.txt
@@ -9,7 +9,7 @@ This is a fairly simple Bundle for the Moab workload manager.
 
 .. code-block:: xml
 
-    <Bundle name='moab' version='2.0'>
+    <Bundle>
       <Path name='/var/spool/moab'/>
       <Path name='/var/spool/moab/moab.cfg'/>
       <Group name='moab-server'>
diff --git a/doc/server/plugins/structures/bundler/nagios.txt b/doc/server/plugins/structures/bundler/nagios.txt
index fa5b67f30..d25e1cf0a 100644
--- a/doc/server/plugins/structures/bundler/nagios.txt
+++ b/doc/server/plugins/structures/bundler/nagios.txt
@@ -12,7 +12,7 @@ the clients.
 
 .. code-block:: xml
 
-    <Bundle name='nagios-client' version='2.0'>
+    <Bundle>
       <Group name='sles8'>
         <Package name='ucdsnmp'/>
       </Group>
diff --git a/doc/server/plugins/structures/bundler/ntp.txt b/doc/server/plugins/structures/bundler/ntp.txt
index b1264b5ee..31bc8a97a 100644
--- a/doc/server/plugins/structures/bundler/ntp.txt
+++ b/doc/server/plugins/structures/bundler/ntp.txt
@@ -12,7 +12,7 @@ better through use of groups.
 
 .. code-block:: xml
 
-    <Bundle name='ntp'>
+    <Bundle>
       <Package name='xntp'/>
       <Path name='/etc/sysconfig/xntp'/>
       <Path name='/etc/sysconfig/clock'/>
diff --git a/doc/server/plugins/structures/bundler/snmpd.txt b/doc/server/plugins/structures/bundler/snmpd.txt
index 2318f8ca1..859e07f7f 100644
--- a/doc/server/plugins/structures/bundler/snmpd.txt
+++ b/doc/server/plugins/structures/bundler/snmpd.txt
@@ -10,7 +10,7 @@ configuration file.
 
 .. code-block:: xml
 
-    <Bundle name="snmpd" version="3.0">
+    <Bundle>
             <Package name="snmpd"/>
             <Service name="snmpd"/>
             <Path name="/etc/snmp/snmpd.conf"/>
diff --git a/doc/server/plugins/structures/bundler/torque.txt b/doc/server/plugins/structures/bundler/torque.txt
index 32e6d4c30..f6349df6e 100644
--- a/doc/server/plugins/structures/bundler/torque.txt
+++ b/doc/server/plugins/structures/bundler/torque.txt
@@ -11,7 +11,7 @@ A longer Bundle that includes many group-specific entries.
 
 .. code-block:: xml
 
-    <Bundle name='torque' version='1.0'>
+    <Bundle>
       <Service name='nfs'/>
       <Service name='nfslock'/>
       <BoundPath type='directory' owner='root' group='root' mode='0755' name='/var/spool/torque'/>
diff --git a/doc/server/plugins/structures/bundler/yp.txt b/doc/server/plugins/structures/bundler/yp.txt
index 6eecb3304..9990fbc2c 100644
--- a/doc/server/plugins/structures/bundler/yp.txt
+++ b/doc/server/plugins/structures/bundler/yp.txt
@@ -14,7 +14,7 @@ treatment too.
 
 .. code-block:: xml
 
-    <Bundle name='yp' version='2.0'>
+    <Bundle>
       <Package name='yp-tools'/>
       <Path name='/etc/nsswitch.conf'/>
       <Path name='/etc/yp.conf'/>
-- 
cgit v1.2.3-1-g7c22