summaryrefslogtreecommitdiffstats
path: root/doc/server/plugins/probes/index.txt
diff options
context:
space:
mode:
Diffstat (limited to 'doc/server/plugins/probes/index.txt')
-rw-r--r--doc/server/plugins/probes/index.txt42
1 files changed, 9 insertions, 33 deletions
diff --git a/doc/server/plugins/probes/index.txt b/doc/server/plugins/probes/index.txt
index 87fd2ba2c..33ec6f444 100644
--- a/doc/server/plugins/probes/index.txt
+++ b/doc/server/plugins/probes/index.txt
@@ -90,7 +90,8 @@ script's output as seen above. Note that we had to wrap the output in an
`int()` call; the script output is treated as a string, so it needs to
be converted before it can be tested numerically.
-With all of these pieces in place, the following series of events will happen when the client is run:
+With all of these pieces in place, the following series of events will
+happen when the client is run:
#. Client runs
#. Server hands down our ``scratchlocal`` probe script
@@ -120,6 +121,10 @@ specific one is used. Only one instance of a probe is served to a given
client, so if a host-specific version and generic version apply, only
the client-specific one will be used.
+If you want to to detect information about the client operating system,
+the :ref:`server-plugins-probes-ohai` plugin can help.
+
+
Other examples
==============
@@ -134,36 +139,7 @@ Other examples
producttype
serial-console-speed
-===========
-Ohai probes
-===========
-
-.. _Ohai: http://wiki.opscode.com/display/ohai/Home
-.. _Ohai-Install: http://wiki.opscode.com/display/ohai/Installation
-
-The `Ohai`_ plugin is used to detect information about the client
-operating system. The data is reported back to the server using JSON.
-
-Client prerequisites
-====================
-
-On the client, you need to install `Ohai`_. See `Ohai-Install`_ for more
-information.
-
-Server prerequisites
-====================
-
-If you have python 2.6 or later installed, you can continue on to
-:ref:`ohai-setup`. Otherwise, you will need to install the
-python-simplejson module found packaged in most distributions.
-
-.. _ohai-setup:
-
-Setup
-=====
+.. toctree::
+ :hidden:
-To enable the Ohai plugin, you need to first create an ``Ohai`` directory
-in your Bcfg2 repository (e.g. ``/var/lib/bcfg2/Ohai``). You then need
-to add **Ohai** to the plugins line in ``bcfg2.conf``. Once this is done,
-restart the server and start a client run. You will have the JSON output
-from the client in the ``Ohai`` directory you created previously.
+ ohai