summaryrefslogtreecommitdiff
path: root/lib/ansible/modules
diff options
context:
space:
mode:
authorSandra McCann <samccann@redhat.com>2022-04-21 17:53:52 -0400
committerGitHub <noreply@github.com>2022-04-21 16:53:52 -0500
commite03069a44438753651e1709654d9a0fd75a6130d (patch)
treee9cf598fa2a70c74b5742e56947ddbb48618166f /lib/ansible/modules
parent91fb18bf31c6dd6c5370e29f8f3008be7609f0d3 (diff)
downloadansible-e03069a44438753651e1709654d9a0fd75a6130d.tar.gz
[docs][backport] Docs backports week 4-18-22 (#77557)
* Update reporting_bugs_and_features.rst (#77518) (cherry picked from commit fa7c5d9b104fdf82eecd1d3089c6d42256b789c7) * docs: Add porting guide for Ansible 6.0.0a1 (#77526) (cherry picked from commit 0d9a580f24862cab3d29752d1d07760c025b5bc9) * Steering Committee: add new member (#77529) (cherry picked from commit 553a226da5820decb497d835e6e83b81d669efa9) * Update pip example with standard lowercase http[s]_proxy env vars (#77515) (cherry picked from commit 2ba39fcf8c3fb5257fca741567faac6fdd767b78) * Update docs to recommend the TTY for prompts over stderr (#77533) (cherry picked from commit 789d29e89564f6c3e09e807d889b73e029d3edd9) * update python devel docs (#77499) * update python devel docs Co-authored-by: Sandra McCann <samccann@redhat.com> (cherry picked from commit 2fc73a9dc357e776dbbbfd035c86fe880415e60a) * setup: remove 'any' as seemingly valid option (#77532) fixes #59783 (cherry picked from commit 762d97f1b835d40d1d7b0542f15cb9a4128526e9) * Update developing_collections_shared.rst (#77497) ##### SUMMARY Use of the meta/runtime.yml file to specify the ansible-core version for collections ##### ISSUE TYPE - Docs Pull Request +label: docsite_pr (cherry picked from commit eef0a1cef986ac5e92a5ae00b6b60ba7be5c77d9) * Update developing_collections_structure.rst (#77496) (cherry picked from commit 538a19b748914e4c7099ad92a07022daae54053d) * Fix a broken link and some grammatical errors (#77531) (cherry picked from commit 0c1cb0e9d45bd8f9584e1b4533cd81b9fa281392) * Add contributor path page (#77494) Co-authored-by: Emmanuel Ugwu <32464178+ugwutotheeshoes@users.noreply.github.com> (cherry picked from commit 3b0d74c14592082b4be5cf8e368e251e3bb6e6d0) Co-authored-by: Iheanacho Amarachi Sharon <58210919+Iheanacho-ai@users.noreply.github.com> Co-authored-by: David Moreau Simard <moi@dmsimard.com> Co-authored-by: Andrew Klychkov <aklychko@redhat.com> Co-authored-by: Junegunn Choi <junegunn.c@gmail.com> Co-authored-by: Matt Martz <matt@sivel.net> Co-authored-by: Brian Coca <bcoca@users.noreply.github.com> Co-authored-by: Emmanuel Ugwu <32464178+ugwutotheeshoes@users.noreply.github.com> Co-authored-by: Kajsa Gauza <nimrod7@gmail.com>
Diffstat (limited to 'lib/ansible/modules')
-rw-r--r--lib/ansible/modules/pip.py5
-rw-r--r--lib/ansible/modules/setup.py6
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/ansible/modules/pip.py b/lib/ansible/modules/pip.py
index 21327bc7b5..c71a857b2e 100644
--- a/lib/ansible/modules/pip.py
+++ b/lib/ansible/modules/pip.py
@@ -159,12 +159,11 @@ EXAMPLES = '''
- bottle>0.10,<0.20,!=0.11
- name: Install python package using a proxy
- # Pip doesn't use the standard environment variables, please use the CAPITALIZED ones below
ansible.builtin.pip:
name: six
environment:
- HTTP_PROXY: '127.0.0.1:8080'
- HTTPS_PROXY: '127.0.0.1:8080'
+ http_proxy: 'http://127.0.0.1:8080'
+ https_proxy: 'https://127.0.0.1:8080'
# You do not have to supply '-e' option in extra_args
- name: Install MyApp using one of the remote protocols (bzr+,hg+,git+,svn+)
diff --git a/lib/ansible/modules/setup.py b/lib/ansible/modules/setup.py
index 715ba13d9d..ecad1a8f56 100644
--- a/lib/ansible/modules/setup.py
+++ b/lib/ansible/modules/setup.py
@@ -114,13 +114,13 @@ EXAMPLES = """
# ansible all -m ansible.builtin.setup -a 'filter=facter_*'
# Collect only facts returned by facter.
-# ansible all -m ansible.builtin.setup -a 'gather_subset=!all,!any,facter'
+# ansible all -m ansible.builtin.setup -a 'gather_subset=!all,facter'
- name: Collect only facts returned by facter
ansible.builtin.setup:
gather_subset:
- '!all'
- - '!any'
+ - '!<any valid subset>'
- facter
- name: Collect only selected facts
@@ -137,7 +137,7 @@ EXAMPLES = """
# ansible all -m ansible.builtin.setup -a 'gather_subset=network,virtual'
# Collect only network and virtual (excludes default minimum facts)
-# ansible all -m ansible.builtin.setup -a 'gather_subset=!all,!any,network,virtual'
+# ansible all -m ansible.builtin.setup -a 'gather_subset=!all,network,virtual'
# Do not call puppet facter or ohai even if present.
# ansible all -m ansible.builtin.setup -a 'gather_subset=!facter,!ohai'