summaryrefslogtreecommitdiffstats
path: root/doc/client
diff options
context:
space:
mode:
authorJason Kincl <kincljc@ornl.gov>2013-08-30 14:35:51 -0400
committerJason Kincl <kincljc@ornl.gov>2013-08-30 14:35:51 -0400
commit05542e5ff0366fb2a7bdf9530cf716c530253fa1 (patch)
tree6e81beb32b7664fcd3083fbbdb23f125a6a2dd10 /doc/client
parent59043506d4ee71e39e89fc3216c2bb5cde92604e (diff)
downloadbcfg2-05542e5ff0366fb2a7bdf9530cf716c530253fa1.tar.gz
bcfg2-05542e5ff0366fb2a7bdf9530cf716c530253fa1.tar.bz2
bcfg2-05542e5ff0366fb2a7bdf9530cf716c530253fa1.zip
doc: Updated Client Actions doc to include BoundActions and another
example schemas: Fixed Action `when` attribute description
Diffstat (limited to 'doc/client')
-rw-r--r--doc/client/tools/actions.txt24
1 files changed, 20 insertions, 4 deletions
diff --git a/doc/client/tools/actions.txt b/doc/client/tools/actions.txt
index 81486ecd1..e5fdb1f39 100644
--- a/doc/client/tools/actions.txt
+++ b/doc/client/tools/actions.txt
@@ -31,10 +31,11 @@ central reporting of action failure is desired, set this attribute to
'check'. Also note that Action entries included in Base will not be
executed.
-Actions cannot be completely defined inside of a bundle; they are a bound
-entry, much like Packages, Services or Paths. The Rules plugin can bind
-these entries. For example to include the above action in a bundle,
-first the Action entry must be included in the bundle:
+Actions may be completely defined inside of a bundle with the use of
+:ref:`server-configurationentries`, much like Packages, Services or Paths.
+The Rules plugin can also bind these entries. For example to include the
+above action in a bundle, first the Action entry must be included in the
+bundle:
.. code-block:: xml
@@ -70,3 +71,18 @@ requires this key.
<Action timing='post' name='apt-key-update' command='apt-key adv --recv-keys --keyserver hkp://pgp.mit.edu 0C5A2783' when='modified' status='check'/>
</Group>
</Rules>
+
+Example BoundAction (add RPM GPG keys)
+======================================
+
+This example will add the RPM-GPG-KEY-redhat-release key to the RPM
+GPG keyring **before** Package entries are handled on the client run.
+
+.. code-block:: xml
+
+ <Bundle name="rpm-gpg-keys">
+ <Group name='rhel'>
+ <Path name="/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release"/>
+ <BoundAction timing="pre" name="install rpm key" command="rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release" when="modified" status="check"/>
+ </Group>
+ </Bundle>