Backportapalooza 02 09

docs/docsite/rst/dev_guide/developing_collections_shared.rst

@@ -78,7 +78,7 @@ You can use git repositories for collection dependencies during local developmen
 
    dependencies: {'git@github.com:organization/repo_name.git': 'devel'}
 
-.. warning
+.. warning::
 
    Do not use git repositories as dependencies for published collections. Dependencies for published collections must be other published collections.
 

docs/docsite/rst/dev_guide/testing/sanity/import.rst

@@ -28,6 +28,7 @@ Instead of using ``import another_library``:
        ANOTHER_LIBRARY_IMPORT_ERROR = traceback.format_exc()
    else:
        HAS_ANOTHER_LIBRARY = True
+       ANOTHER_LIBRARY_IMPORT_ERROR = None
 
 .. note::
 

docs/docsite/rst/dev_guide/testing_units_modules.rst

@@ -388,8 +388,8 @@ Here is a simple mock of :meth:`AnsibleModule.run_command` (taken from :file:`te
 
         with patch.object(basic.AnsibleModule, 'run_command') as run_command:
             run_command.return_value = 0, '', ''  # successful execution, no output
-                with self.assertRaises(AnsibleExitJson) as result:
-                    my_module.main()
+            with self.assertRaises(AnsibleExitJson) as result:
+                my_module.main()
                 self.assertFalse(result.exception.args[0]['changed'])
         # Check that run_command has been called
         run_command.assert_called_once_with('/usr/bin/command args')

docs/docsite/rst/network/getting_started/first_playbook.rst

@@ -91,7 +91,7 @@ The playbook sets three of the seven values from the command line above: the gro
 
 The playbook contains one play with two tasks, and should generate output like this:
 
-.. code-block:: bash
+.. code-block:: shell
 
    $ ansible-playbook -i vyos.example.net, -u ansible -k -e ansible_network_os=vyos.vyos.vyos first_playbook.yml
 
@@ -115,7 +115,7 @@ The playbook contains one play with two tasks, and should generate output like t
 
 The extended first playbook has five tasks in a single play. Run it with the same command you used above. The output shows you the change Ansible made to the config:
 
-.. code-block:: bash
+.. code-block:: shell
 
    $ ansible-playbook -i vyos.example.net, -u ansible -k -e ansible_network_os=vyos.vyos.vyos first_playbook_ext.yml
 

lib/ansible/modules/dnf.py

@@ -313,6 +313,14 @@
     name: "*"
     state: latest
 
+- name: Update the webserver, depending on which is installed on the system. Do not install the other one
+  ansible.builtin.dnf:
+    name:
+      - httpd
+      - nginx
+    state: latest
+    update_only: yes
+
 - name: Install the nginx rpm from a remote repo
   ansible.builtin.dnf:
     name: 'http://nginx.org/packages/centos/6/noarch/RPMS/nginx-release-centos-6-0.el6.ngx.noarch.rpm'

lib/ansible/modules/uri.py

@@ -142,7 +142,7 @@
       - This should only set to C(false) used on personally controlled sites using self-signed certificates.
       - Prior to 1.9.2 the code defaulted to C(false).
     type: bool
-    default: yes
+    default: true
     version_added: '1.9.2'
   client_cert:
     description:
@@ -184,7 +184,7 @@
     description:
       - If C(false), it will not use a proxy, even if one is defined in an environment variable on the target hosts.
     type: bool
-    default: yes
+    default: true
   unix_socket:
     description:
     - Path to Unix domain socket to use for connection
@@ -252,7 +252,7 @@
 - name: Check that a page returns a status 200 and fail if the word AWESOME is not in the page contents
   ansible.builtin.uri:
     url: http://www.example.com
-    return_content: yes
+    return_content: true
   register: this
   failed_when: "'AWESOME' not in this.content"
 
@@ -263,7 +263,7 @@
     password: your_pass
     method: POST
     body: "{{ lookup('ansible.builtin.file','issue.json') }}"
-    force_basic_auth: yes
+    force_basic_auth: true
     status_code: 201
     body_format: json
 
@@ -310,7 +310,7 @@
   ansible.builtin.uri:
     url: https://your.form.based.auth.example.com/dashboard.php
     method: GET
-    return_content: yes
+    return_content: true
     headers:
       Cookie: "{{ login.cookies_string }}"
 
@@ -320,7 +320,7 @@
     user: "{{ jenkins.user }}"
     password: "{{ jenkins.password }}"
     method: GET
-    force_basic_auth: yes
+    force_basic_auth: true
     status_code: 201
 
 - name: POST from contents of local file
@@ -334,7 +334,7 @@
     url: https://httpbin.org/post
     method: POST
     src: /path/to/my/file.json
-    remote_src: yes
+    remote_src: true
 
 - name: Create workspaces in Log analytics Azure
   ansible.builtin.uri: