Merge branch 'master' of https://github.com/solj/bcfg2

5 files changed, 37 insertions, 9 deletions

diff --git a/doc/appendix/guides/centos.txt b/doc/appendix/guides/centos.txt
index d89d532ba..525cb5a98 100644
--- a/doc/appendix/guides/centos.txt
+++ b/doc/appendix/guides/centos.txt
@@ -431,7 +431,7 @@ packages. Currently, the way to manage them is using :ref:`BoundEntries
 .. code-block:: xml
 
     <Bundle name='base-packages'>
-            <BoundPackage name="gpg-pubkey" type="rpm">
+            <BoundPackage name="gpg-pubkey" type="rpm" version="foo">
                             <Instance simplefile="/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5" version="e8562897" release="459f07a4"/>
                             <Instance simplefile="/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL" version="217521f6" release="45e8a532"/>
             </BoundPackage>
@@ -452,6 +452,10 @@ packages. Currently, the way to manage them is using :ref:`BoundEntries
             <Package name='yum'/>
     </Bundle>
 
+.. note::
+
+    version="foo" is just a dummy attribute for the gpg-pubkey Package
+
 To actually push the gpg keys out via Bcfg2, you will need to manage the
 files as well. This can be done by adding Path entries for each of the
 gpg keys you want to manage
@@ -461,7 +465,7 @@ gpg keys you want to manage
     <Bundle name='base-packages'>
             <Path name='/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5'/>
             <Path name='/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL'/>
-            <BoundPackage name="gpg-pubkey" type="rpm">
+            <BoundPackage name="gpg-pubkey" type="rpm" version="foo">
                             <Instance simplefile="/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5" version="e8562897" release="459f07a4"/>
                             <Instance simplefile="/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL" version="217521f6" release="45e8a532"/>
             </BoundPackage>
diff --git a/doc/appendix/guides/converging_rhel5.txt b/doc/appendix/guides/converging_rhel5.txt
index 7581d307f..d6a9d2d1c 100644
--- a/doc/appendix/guides/converging_rhel5.txt
+++ b/doc/appendix/guides/converging_rhel5.txt
@@ -81,7 +81,7 @@ For a "Package"
 
          <Bundle name='keys'>
            <!-- GPG keys -->
-           <BoundPackage name="gpg-pubkey" type="yum">
+           <BoundPackage name="gpg-pubkey" type="rpm" version="foo">
              <Instance simplefile="/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL" version="217521f6" release="45e8a532"/>
              <Instance simplefile="/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release" version="37017186" release="45761324"/>
            </BoundPackage>
diff --git a/doc/appendix/guides/fedora.txt b/doc/appendix/guides/fedora.txt
index 4e3244eaa..12432b04f 100644
--- a/doc/appendix/guides/fedora.txt
+++ b/doc/appendix/guides/fedora.txt
@@ -339,7 +339,7 @@ Bundle now looks like this
 .. code-block:: xml
 
     <Bundle name='base-packages'>
-            <BoundPackage name="gpg-pubkey" type="rpm">
+            <BoundPackage name="gpg-pubkey" type="rpm" version="foo">
                             <Instance simplefile="/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5" version="e8562897" release="459f07a4"/>
                             <Instance simplefile="/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL" version="217521f6" release="45e8a532"/>
             </BoundPackage>
@@ -360,6 +360,10 @@ Bundle now looks like this
             <Package name='yum'/>
     </Bundle>
 
+.. note::
+
+    version="foo" is just a dummy attribute for the gpg-pubkey Package
+
 To actually push the gpg keys out via Bcfg2, you will need to manage
 the files as well. This can be done by adding Path entries for each
 of the gpg keys you want to manage
@@ -369,7 +373,7 @@ of the gpg keys you want to manage
     <Bundle name='base-packages'>
             <Path name='/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5'/>
             <Path name='/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL'/>
-            <BoundPackage name="gpg-pubkey" type="rpm">
+            <BoundPackage name="gpg-pubkey" type="rpm" version="foo">
                             <Instance simplefile="/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5" version="e8562897" release="459f07a4"/>
                             <Instance simplefile="/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL" version="217521f6" release="45e8a532"/>
             </BoundPackage>
diff --git a/doc/client/tools/yumng.txt b/doc/client/tools/yumng.txt
index dd712ddec..c2e9161a1 100644
--- a/doc/client/tools/yumng.txt
+++ b/doc/client/tools/yumng.txt
@@ -18,9 +18,15 @@ and SUSE based distributions.
 
 Examples of this are:
 
-* SLES10 and openSUSE 10.2 both install six GPG keys.  From an RPM perspective this means that there are six packages with the name gpg-pubkey.
-* YUM always installs, as opposed to upgrades, kernel packages.  This is hard coded in YUM (actually it can be overridden in yum.conf), so systems using YUM will eventually have multiple kernel packages installed.
-* Red Hat family x86_64 based systems frequently have both an x86_64 and an i386 version of the same package installed.
+* SLES10 and openSUSE 10.2 both install six GPG keys.  From an RPM
+  perspective this means that there are six packages with the name
+  gpg-pubkey.
+* YUM always installs, as opposed to upgrades, kernel packages.  This is
+  hard coded in YUM (actually it can be overridden in yum.conf),
+  so systems using YUM will eventually have multiple kernel packages
+  installed.
+* Red Hat family x86_64 based systems frequently have both an x86_64
+  and an i386 version of the same package installed.
 
 The new Pkgmgr format files with Instances are therefore the only way to
 accurately describe an RPM based system.  It is recommended that all RPM
@@ -50,7 +56,9 @@ Features
 * Support for per instance ignoring of individual files for the RPM verification with the Ignore tag.
 * Multiple package Instances with full version information listed in interactive mode.
 * Support for installation and removal of gpg-pubkey packages.
-* Support for controlling what action is taken on package verification failure with the install_action, version_fail_action and verify_fail_action attributes.
+* Support for controlling what action is taken on package
+  verification failure with the install_action, version_fail_action and
+  verify_fail_action attributes.
 
 
 RPMng Driver Overview
diff --git a/doc/help/troubleshooting.txt b/doc/help/troubleshooting.txt
index 17bc391bd..e593db2f7 100644
--- a/doc/help/troubleshooting.txt
+++ b/doc/help/troubleshooting.txt
@@ -145,6 +145,10 @@ be taken to remedy them.
 |                              |          | character present   |              |
 |                              |          | in this file.       |              |
 +------------------------------+----------+---------------------+--------------+
+| Got unknown entries          | Server   | The Packages plugin | [11]_        |
+| [list of unknown entries]    |          | has no knowledge of |              |
+|                              |          | the listed entries  |              |
++------------------------------+----------+---------------------+--------------+
 
 
 .. [1] This entry is not being bound. Ensure that a version of this
@@ -166,6 +170,14 @@ be taken to remedy them.
        group is properly setup.
 .. [10] Ensure the correct encoding is specified in the [components]
         section of ``bcfg2.conf``.
+.. [11] For packages listed other than **gpg-pubkey**, this error means
+        that the Packages plugin is unable to find the package in any of
+        the sources listed in ``Packages/config.xml``. The issue often
+        arises when the client is not in one of the groups necessary for
+        the Source listed. In the case of gpg-pubkey, you can safely
+        ignore the message as the Packages plugin has no knowledge of
+        these packages (however, note that this package is most often
+        specified as a BoundPackage entry).
 
 FAQs
 ====