diff --git a/docs/docsite/rst/community/contributions_collections.rst b/docs/docsite/rst/community/contributions_collections.rst index 557293fe7ab..f702d590f3b 100644 --- a/docs/docsite/rst/community/contributions_collections.rst +++ b/docs/docsite/rst/community/contributions_collections.rst @@ -31,3 +31,4 @@ Working with the Ansible collection repositories * How do I :ref:`rebase my PR `? * How do I learn about Ansible's :ref:`testing (CI) process `? * How do I :ref:`deprecate a module `? +* See `Collection developer tutorials `_ for a quick introduction on how to develop and test your collection contributions. diff --git a/docs/docsite/rst/images/ansible_basic.svg b/docs/docsite/rst/images/ansible_basic.svg index 9c89f9ab266..6217c89ff39 100644 --- a/docs/docsite/rst/images/ansible_basic.svg +++ b/docs/docsite/rst/images/ansible_basic.svg @@ -24,15 +24,15 @@ inkscape:deskcolor="#d1d1d1" inkscape:document-units="px" showgrid="false" - inkscape:zoom="0.84096521" - inkscape:cx="332.3562" - inkscape:cy="355.54384" + inkscape:zoom="0.5946522" + inkscape:cx="298.49381" + inkscape:cy="538.12968" inkscape:window-width="1920" inkscape:window-height="979" inkscape:window-x="0" inkscape:window-y="32" inkscape:window-maximized="1" - inkscape:current-layer="layer1" /> + id="path10481" /> diff --git a/lib/ansible/modules/setup.py b/lib/ansible/modules/setup.py index ecad1a8f562..c4e5d082096 100644 --- a/lib/ansible/modules/setup.py +++ b/lib/ansible/modules/setup.py @@ -17,9 +17,19 @@ options: version_added: "2.1" description: - "If supplied, restrict the additional facts collected to the given subset. - Possible values: C(all), C(min), C(hardware), C(network), C(virtual), C(ohai), and - C(facter). Can specify a list of values to specify a larger subset. - Values can also be used with an initial C(!) to specify that + Possible values: C(all), C(all_ipv4_addresses), C(all_ipv6_addresses), C(apparmor), C(architecture), + C(caps), C(chroot),C(cmdline), C(date_time), C(default_ipv4), C(default_ipv6), C(devices), + C(distribution), C(distribution_major_version), C(distribution_release), C(distribution_version), + C(dns), C(effective_group_ids), C(effective_user_id), C(env), C(facter), C(fips), C(hardware), + C(interfaces), C(is_chroot), C(iscsi), C(kernel), C(local), C(lsb), C(machine), C(machine_id), + C(mounts), C(network), C(ohai), C(os_family), C(pkg_mgr), C(platform), C(processor), C(processor_cores), + C(processor_count), C(python), C(python_version), C(real_user_id), C(selinux), C(service_mgr), + C(ssh_host_key_dsa_public), C(ssh_host_key_ecdsa_public), C(ssh_host_key_ed25519_public), + C(ssh_host_key_rsa_public), C(ssh_host_pub_keys), C(ssh_pub_keys), C(system), C(system_capabilities), + C(system_capabilities_enforced), C(user), C(user_dir), C(user_gecos), C(user_gid), C(user_id), + C(user_shell), C(user_uid), C(virtual), C(virtualization_role), C(virtualization_type). + Can specify a list of values to specify a larger subset. + Values can also be used with an initial C(!) to specify that that specific subset should not be collected. For instance: C(!hardware,!network,!virtual,!ohai,!facter). If C(!all) is specified then only the min subset is collected. To avoid collecting even the diff --git a/lib/ansible/modules/unarchive.py b/lib/ansible/modules/unarchive.py index e9062a7c79a..c5da9615736 100644 --- a/lib/ansible/modules/unarchive.py +++ b/lib/ansible/modules/unarchive.py @@ -34,6 +34,7 @@ options: dest: description: - Remote absolute path where the archive should be unpacked. + - The given path must exist. Base directory is not created by this module. type: path required: true copy: @@ -46,6 +47,7 @@ options: creates: description: - If the specified absolute path (file or directory) already exists, this step will B(not) be run. + - The specified absolute path (file or directory) must be below the base path given with C(dest:). type: path version_added: "1.6" io_buffer_size: diff --git a/lib/ansible/modules/uri.py b/lib/ansible/modules/uri.py index 1413d365de6..aed68ba51cd 100644 --- a/lib/ansible/modules/uri.py +++ b/lib/ansible/modules/uri.py @@ -149,6 +149,7 @@ options: description: - Path to file to be submitted to the remote server. - Cannot be used with I(body). + - Should be used with I(force_basic_auth) to ensure success when the remote end sends a 401. type: path version_added: '2.7' remote_src: