Merge remote-tracking branch 'ungleich/master' into parallel-global-explorers-execution

docs/src/cdist-manifest.rst

@@ -53,8 +53,8 @@ Cdist expects the initial manifest at **cdist/conf/manifest/init**.
 
 Within this initial manifest you define, which objects should be
 created on which host. To distinguish between hosts, you can use the
-environment variable **__target_host**. Let's have a look at a simple
-example::
+environment variable **__target_host** and/or **__target_hostname** and/or
+**__target_fqdn**. Let's have a look at a simple example::
 
     __cdistmarker
 

docs/src/cdist-reference.rst.sh

@@ -226,7 +226,18 @@ __object_name
     The full qualified name of the current object.
     Available for: type manifest, type explorer, type gencode.
 __target_host
-    The host we are deploying to.
+    The host we are deploying to. This is primary variable. It's content is
+    literally the one user passed in.
+    Available for: explorer, initial manifest, type explorer, type manifest, type gencode, shell.
+__target_hostname
+    The hostname of host we are deploying to. This variable is derived from
+    **__target_host** (using **socket.getaddrinfo(__target_host)** and then
+    **socket.gethostbyaddr()**).
+    Available for: explorer, initial manifest, type explorer, type manifest, type gencode, shell.
+__target_fqdn
+    The fully qualified domain name of the host we are deploying to.
+    This variable is derived from **__target_host**
+    (using **socket.getfqdn()**).
     Available for: explorer, initial manifest, type explorer, type manifest, type gencode, shell.
 __type
     Path to the current type.

docs/src/man1/cdist.rst

@@ -15,10 +15,10 @@ SYNOPSIS
 
     cdist banner [-h] [-d] [-v]
 
-    config [-h] [-d] [-v] [-c CONF_DIR] [-f HOSTFILE] [-i MANIFEST]
-           [-n] [-o OUT_PATH] [-p] [-s] [--remote-copy REMOTE_COPY]
-           [--remote-exec REMOTE_EXEC] [-j [JOBS]]
-           [host [host ...]]
+    cdist config [-h] [-d] [-v] [-c CONF_DIR] [-f HOSTFILE] [-i MANIFEST]
+                 [-n] [-o OUT_PATH] [-p] [-s] [--remote-copy REMOTE_COPY]
+                 [--remote-exec REMOTE_EXEC] [-j [JOBS]]
+                 [host [host ...]]
 
     cdist shell [-h] [-d] [-v] [-s SHELL]
 
@@ -35,14 +35,14 @@ GENERAL
 -------
 All commands accept the following options:
 
+.. option:: -h, --help
+
+    Show the help screen
+
 .. option:: -d, --debug
 
     Set log level to debug
 
-.. option:: -h, --help
-
-   Show the help screen
-
 .. option:: -v, --verbose
 
     Set log level to info, be more verbose
@@ -83,13 +83,21 @@ Configure one or more hosts.
 
     Path to a cdist manifest or - to read from stdin
 
+.. option:: -n, --dry-run
+
+    Do not execute code
+
+.. option:: -o OUT_PATH, --out-dir OUT_PATH
+
+    Directory to save cdist output in
+
 .. option:: -p, --parallel
 
     Operate on multiple hosts in parallel
 
 .. option:: -s, --sequential
 
-    Operate on multiple hosts sequentially
+    Operate on multiple hosts sequentially (default)
 
 .. option:: --remote-copy REMOTE_COPY
 
@@ -111,7 +119,7 @@ to the types as commands. It can be thought as an
 "interactive manifest" environment. See below for example
 usage. Its primary use is for debugging type parameters.
 
-.. option:: -s/--shell
+.. option:: -s SHELL, --shell SHELL
 
     Select shell to use, defaults to current shell. Used shell should
     be POSIX compatible shell.