summaryrefslogtreecommitdiff
path: root/lib/ansible/modules/utilities
diff options
context:
space:
mode:
authorDag Wieers <dag@wieers.com>2017-06-26 16:26:53 +0100
committerJohn R Barker <john@johnrbarker.com>2017-06-26 16:26:53 +0100
commit7d7051fc546087151826ce5170f12056bbe8fe37 (patch)
tree60cb3338fbbb7ac7779451b753b8822d1c3d3216 /lib/ansible/modules/utilities
parent8765eadb307cc864ad1daa029db17e0a7bb78e90 (diff)
downloadansible-7d7051fc546087151826ce5170f12056bbe8fe37.tar.gz
Mutually reference Windows and non-Windows modules (#25482)
* Mutually reference Windows and non-Windows modules To make it easier for Windows or non-Windows users to find the relevant module information, we are mutually referencing both variants in their documentation. We are also adding a special note if a module works on both Windows and non-Windows targets. * Mutually reference Windows and non-Windows modules To make it easier for Windows or non-Windows users to find the relevant module information, we are mutually referencing both variants in their documentation. We are also adding a special note if a module works on both Windows and non-Windows targets. * Replace 'look at' with 'use', as requested ci_complete
Diffstat (limited to 'lib/ansible/modules/utilities')
-rw-r--r--lib/ansible/modules/utilities/helper/meta.py5
-rw-r--r--lib/ansible/modules/utilities/logic/assert.py4
-rw-r--r--lib/ansible/modules/utilities/logic/async_status.py8
-rw-r--r--lib/ansible/modules/utilities/logic/debug.py4
-rw-r--r--lib/ansible/modules/utilities/logic/fail.py3
-rw-r--r--lib/ansible/modules/utilities/logic/include.py2
-rw-r--r--lib/ansible/modules/utilities/logic/include_role.py4
-rw-r--r--lib/ansible/modules/utilities/logic/include_vars.py3
-rw-r--r--lib/ansible/modules/utilities/logic/pause.py2
-rw-r--r--lib/ansible/modules/utilities/logic/set_fact.py2
-rw-r--r--lib/ansible/modules/utilities/logic/set_stats.py3
-rw-r--r--lib/ansible/modules/utilities/logic/wait_for.py4
-rw-r--r--lib/ansible/modules/utilities/logic/wait_for_connection.py3
13 files changed, 36 insertions, 11 deletions
diff --git a/lib/ansible/modules/utilities/helper/meta.py b/lib/ansible/modules/utilities/helper/meta.py
index 607ba8b665..00ed8943d6 100644
--- a/lib/ansible/modules/utilities/helper/meta.py
+++ b/lib/ansible/modules/utilities/helper/meta.py
@@ -31,6 +31,7 @@ description:
- Meta tasks are a special kind of task which can influence Ansible internal execution or state. Prior to Ansible 2.0,
the only meta option available was `flush_handlers`. As of 2.2, there are five meta tasks which can be used.
Meta tasks can be used anywhere within your playbook.
+ - This module is also supported for Windows targets.
options:
free_form:
description:
@@ -48,9 +49,9 @@ options:
- "C(reset_connection) (added in 2.3) interrupts a persistent connection (i.e. ssh + control persist)"
choices: ['noop', 'flush_handlers', 'refresh_inventory', 'clear_facts', 'clear_host_errors', 'end_play', 'reset_connection']
required: true
- default: null
notes:
- - meta is not really a module nor action_plugin as such it cannot be overwritten.
+ - C(meta) is not really a module nor action_plugin as such it cannot be overwritten.
+ - This module is also supported for Windows targets.
author:
- "Ansible Core Team"
'''
diff --git a/lib/ansible/modules/utilities/logic/assert.py b/lib/ansible/modules/utilities/logic/assert.py
index 46a53ec067..3aceaf1e32 100644
--- a/lib/ansible/modules/utilities/logic/assert.py
+++ b/lib/ansible/modules/utilities/logic/assert.py
@@ -29,6 +29,7 @@ module: assert
short_description: Asserts given expressions are true
description:
- This module asserts that given expressions are true with an optional custom message.
+ - This module is also supported for Windows targets.
version_added: "1.5"
options:
that:
@@ -39,7 +40,8 @@ options:
msg:
description:
- "The customized message used for a failing assertion"
- required: false
+notes:
+ - This module is also supported for Windows targets.
author:
- "Ansible Core Team"
- "Michael DeHaan"
diff --git a/lib/ansible/modules/utilities/logic/async_status.py b/lib/ansible/modules/utilities/logic/async_status.py
index 267aa11143..409b212d24 100644
--- a/lib/ansible/modules/utilities/logic/async_status.py
+++ b/lib/ansible/modules/utilities/logic/async_status.py
@@ -29,25 +29,23 @@ DOCUMENTATION = '''
module: async_status
short_description: Obtain status of asynchronous task
description:
- - "This module gets the status of an asynchronous task."
+ - This module gets the status of an asynchronous task.
+ - This module is also supported for Windows targets.
version_added: "0.5"
options:
jid:
description:
- Job or task identifier
required: true
- default: null
- aliases: []
mode:
description:
- if C(status), obtain the status; if C(cleanup), clean up the async job cache
located in C(~/.ansible_async/) for the specified job I(jid).
- required: false
choices: [ "status", "cleanup" ]
default: "status"
notes:
- See also U(http://docs.ansible.com/playbooks_async.html)
-requirements: []
+ - This module is also supported for Windows targets.
author:
- "Ansible Core Team"
- "Michael DeHaan"
diff --git a/lib/ansible/modules/utilities/logic/debug.py b/lib/ansible/modules/utilities/logic/debug.py
index 2c36f79409..ba79138062 100644
--- a/lib/ansible/modules/utilities/logic/debug.py
+++ b/lib/ansible/modules/utilities/logic/debug.py
@@ -31,7 +31,7 @@ description:
- This module prints statements during execution and can be useful
for debugging variables or expressions without necessarily halting
the playbook. Useful for debugging together with the 'when:' directive.
-
+ - This module is also supported for Windows targets.
version_added: "0.8"
options:
msg:
@@ -49,6 +49,8 @@ options:
required: False
default: 0
version_added: "2.1"
+notes:
+ - This module is also supported for Windows targets.
author:
- "Dag Wieers (@dagwieers)"
- "Michael DeHaan"
diff --git a/lib/ansible/modules/utilities/logic/fail.py b/lib/ansible/modules/utilities/logic/fail.py
index 093099b7d3..09d60c75ab 100644
--- a/lib/ansible/modules/utilities/logic/fail.py
+++ b/lib/ansible/modules/utilities/logic/fail.py
@@ -30,6 +30,7 @@ short_description: Fail with custom message
description:
- This module fails the progress with a custom message. It can be
useful for bailing out when a certain condition is met using C(when).
+ - This module is also supported for Windows targets.
version_added: "0.8"
options:
msg:
@@ -38,6 +39,8 @@ options:
fail will simply bail out with a generic message.
required: false
default: "'Failed as requested from task'"
+notes:
+ - This module is also supported for Windows targets.
author: "Dag Wieers (@dagwieers)"
'''
diff --git a/lib/ansible/modules/utilities/logic/include.py b/lib/ansible/modules/utilities/logic/include.py
index 7e7b13418b..9010809cc8 100644
--- a/lib/ansible/modules/utilities/logic/include.py
+++ b/lib/ansible/modules/utilities/logic/include.py
@@ -26,6 +26,7 @@ description:
- Static includes are not subject to most directives, for example, loops or conditionals, they are applied instead to each inherited task.
- Since 2.0 task includes are dynamic and behave more like real tasks. This means they can be looped, skipped and use variables from any source.
Ansible tries to auto detect this, use the `static` directive (new in 2.1) to bypass autodetection.
+ - This module is also supported for Windows targets.
version_added: "0.6"
options:
free-form:
@@ -34,6 +35,7 @@ options:
notes:
- This is really not a module, though it appears as such, this is a feature of the Ansible Engine, as such it cannot be overridden the same way a
module can.
+ - This module is also supported for Windows targets.
'''
EXAMPLES = """
diff --git a/lib/ansible/modules/utilities/logic/include_role.py b/lib/ansible/modules/utilities/logic/include_role.py
index 5e4d52a23f..01ae3bcf8d 100644
--- a/lib/ansible/modules/utilities/logic/include_role.py
+++ b/lib/ansible/modules/utilities/logic/include_role.py
@@ -20,7 +20,8 @@ author:
module: include_role
short_description: Load and execute a role
description:
- - "Loads and executes a role as a task, this frees roles from the `role:` directive and allows them to be treated more as tasks."
+ - Loads and executes a role as a task, this frees roles from the `role:` directive and allows them to be treated more as tasks.
+ - This module is also supported for Windows targets.
version_added: "2.2"
options:
name:
@@ -57,6 +58,7 @@ notes:
- As with C(include) this task can be static or dynamic, If static it implies that it won't need templating nor loops nor conditionals and will
show included tasks in the --list options. Ansible will try to autodetect what is needed, but you can set `static` to `yes` or `no` at task
level to control this.
+ - This module is also supported for Windows targets.
'''
EXAMPLES = """
diff --git a/lib/ansible/modules/utilities/logic/include_vars.py b/lib/ansible/modules/utilities/logic/include_vars.py
index da7977bd93..5ba6237829 100644
--- a/lib/ansible/modules/utilities/logic/include_vars.py
+++ b/lib/ansible/modules/utilities/logic/include_vars.py
@@ -21,6 +21,7 @@ short_description: Load variables from files, dynamically within a task.
description:
- Loads variables from a YAML/JSON files dynamically from within a file or from a directory recursively during task runtime. If loading a directory,
the files are sorted alphabetically before being loaded.
+ - This module is also supported for Windows targets.
version_added: "1.4"
options:
file:
@@ -65,6 +66,8 @@ options:
description:
- This module allows you to specify the 'file' option directly w/o any other options.
There is no 'free-form' option, this is just an indicator, see example below.
+notes:
+ - This module is also supported for Windows targets.
'''
EXAMPLES = """
diff --git a/lib/ansible/modules/utilities/logic/pause.py b/lib/ansible/modules/utilities/logic/pause.py
index c01503afe9..7e577faba9 100644
--- a/lib/ansible/modules/utilities/logic/pause.py
+++ b/lib/ansible/modules/utilities/logic/pause.py
@@ -33,6 +33,7 @@ description:
- >
The pause module integrates into async/parallelized playbooks without any special considerations (see also: Rolling Updates). When using pauses with
the C(serial) playbook parameter (as in rolling updates) you are only prompted once for the current group of hosts.
+ - This module is also supported for Windows targets.
version_added: "0.8"
options:
minutes:
@@ -53,6 +54,7 @@ options:
author: "Tim Bielawa (@tbielawa)"
notes:
- Starting in 2.2, if you specify 0 or negative for minutes or seconds, it will wait for 1 second, previously it would wait indefinitely.
+ - This module is also supported for Windows targets.
'''
EXAMPLES = '''
diff --git a/lib/ansible/modules/utilities/logic/set_fact.py b/lib/ansible/modules/utilities/logic/set_fact.py
index 86042e5ae7..3c7f4b300d 100644
--- a/lib/ansible/modules/utilities/logic/set_fact.py
+++ b/lib/ansible/modules/utilities/logic/set_fact.py
@@ -34,6 +34,7 @@ description:
a fact cache.
- Per the standard Ansible variable precedence rules, many other types of variables have a higher priority, so this value may be overridden.
See U(http://docs.ansible.com/ansible/playbooks_variables.html#variable-precedence-where-should-i-put-a-variable) for more information.
+ - This module is also supported for Windows targets.
options:
key_value:
description:
@@ -46,6 +47,7 @@ version_added: "1.2"
notes:
- "The `var=value` notation can only create strings or booleans.
If you want to create lists/arrays or dictionary/hashes use `var: [val1, val2]`"
+ - This module is also supported for Windows targets.
'''
EXAMPLES = '''
diff --git a/lib/ansible/modules/utilities/logic/set_stats.py b/lib/ansible/modules/utilities/logic/set_stats.py
index 59da69d5db..fad27b8c6d 100644
--- a/lib/ansible/modules/utilities/logic/set_stats.py
+++ b/lib/ansible/modules/utilities/logic/set_stats.py
@@ -29,6 +29,7 @@ module: set_stats
short_description: Set stats for the current ansible run
description:
- This module allows setting/accumulating stats on the current ansible run, either per host of for all hosts in the run.
+ - This module is also supported for Windows targets.
options:
data:
description:
@@ -44,6 +45,8 @@ options:
- boolean that indicates if the provided value is aggregated to the existing stat C(yes) or will replace it C(no)
required: no
default: yes
+notes:
+ - This module is also supported for Windows targets.
version_added: "2.3"
'''
diff --git a/lib/ansible/modules/utilities/logic/wait_for.py b/lib/ansible/modules/utilities/logic/wait_for.py
index 119085f4a1..cc2ee219de 100644
--- a/lib/ansible/modules/utilities/logic/wait_for.py
+++ b/lib/ansible/modules/utilities/logic/wait_for.py
@@ -39,6 +39,7 @@ description:
- In 1.8 and later, this module can also be used to wait for active
connections to be closed before continuing, useful if a node
is being rotated out of a load balancer pool.
+ - This module is also supported for Windows targets.
version_added: "0.7"
options:
host:
@@ -99,6 +100,8 @@ options:
- This overrides the normal error message from a failure to meet the required conditions.
notes:
- The ability to use search_regex with a port connection was added in 1.7.
+ - This module is also supported for Windows targets.
+ - See also M(wait_for_connection)
author:
- Jeroen Hoekx (@jhoekx)
- John Jarvis (@jarv)
@@ -106,7 +109,6 @@ author:
'''
EXAMPLES = r'''
-
- name: Wait 300 seconds for port 8000 to become open on the host, don't start checking for 10 seconds
wait_for:
port: 8000
diff --git a/lib/ansible/modules/utilities/logic/wait_for_connection.py b/lib/ansible/modules/utilities/logic/wait_for_connection.py
index cd2a681419..8d0a57bb0c 100644
--- a/lib/ansible/modules/utilities/logic/wait_for_connection.py
+++ b/lib/ansible/modules/utilities/logic/wait_for_connection.py
@@ -32,6 +32,7 @@ description:
- Retries the transport connection after a timeout of C(connect_timeout).
- Tests the transport connection every C(sleep) seconds.
- This module makes use of internal ansible transport (and configuration) and the ping/win_ping module to guarantee correct end-to-end functioning.
+- This module is also supported for Windows targets.
version_added: "2.3"
options:
connect_timeout:
@@ -50,6 +51,8 @@ options:
description:
- Maximum number of seconds to wait for.
default: 600
+notes:
+- This module is also supported for Windows targets.
author: "Dag Wieers (@dagwieers)"
'''