Release 6.2.0.

* rax modules: deprecation notice for branch stable-6

* add changelog fragment

* adjust changelog message

* adjust changelog message

.azure-pipelines/azure-pipelines.yml

@@ -189,6 +189,24 @@ stages:
             - test: 3.5
 
 ## Remote
+  - stage: Remote_devel_extra_vms
+    displayName: Remote devel extra VMs
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: devel/{0}
+          targets:
+            - name: Alpine 3.16
+              test: alpine/3.16
+            # - name: Fedora 36
+            #   test: fedora/36
+            # - name: Ubuntu 20.04
+            #   test: ubuntu/20.04
+            - name: Ubuntu 22.04
+              test: ubuntu/22.04
+          groups:
+            - vm
   - stage: Remote_devel
     displayName: Remote devel
     dependsOn: []
@@ -203,8 +221,6 @@ stages:
               test: rhel/7.9
             - name: RHEL 9.0
               test: rhel/9.0
-            - name: FreeBSD 12.3
-              test: freebsd/12.3
             - name: FreeBSD 13.1
               test: freebsd/13.1
           groups:
@@ -221,8 +237,8 @@ stages:
           targets:
             - name: RHEL 9.0
               test: rhel/9.0
-            - name: FreeBSD 13.1
+            - name: FreeBSD 12.3
-              test: freebsd/13.1
+              test: freebsd/12.3
           groups:
             - 1
             - 2
@@ -386,7 +402,7 @@ stages:
             - name: ArchLinux
               test: archlinux/3.10
             - name: CentOS Stream 8
-              test: centos-stream8/3.8
+              test: centos-stream8/3.9
           groups:
             - 1
             - 2
@@ -459,6 +475,7 @@ stages:
       - Units_2_12
       - Units_2_13
       - Units_2_14
+      - Remote_devel_extra_vms
       - Remote_devel
       - Remote_2_11
       - Remote_2_12

.github/BOTMETA.yml

@@ -309,6 +309,9 @@ files:
   $module_utils/pipx.py:
     labels: pipx
     maintainers: russoz
+  $module_utils/puppet.py:
+    labels: puppet
+    maintainers: russoz
   $module_utils/pure.py:
     labels: pure pure_storage
     maintainers: $team_purestorage
@@ -320,6 +323,8 @@ files:
   $module_utils/scaleway.py:
     labels: cloud scaleway
     maintainers: $team_scaleway
+  $module_utils/ssh.py:
+    maintainers: russoz
   $module_utils/storage/hpe3par/hpe3par.py:
     maintainers: farhan7500 gautamphegde
   $module_utils/utm_utils.py:

CHANGELOG.rst

@@ -6,6 +6,68 @@ Community General Release Notes
 
 This changelog describes changes after version 5.0.0.
 
+v6.2.0
+======
+
+Release Summary
+---------------
+
+Regular bugfix and feature release.
+
+Minor Changes
+-------------
+
+- opkg - allow installing a package in a certain version (https://github.com/ansible-collections/community.general/pull/5688).
+- proxmox - added new module parameter ``tags`` for use with PVE 7+ (https://github.com/ansible-collections/community.general/pull/5714).
+- puppet - refactored module to use ``CmdRunner`` for executing ``puppet`` (https://github.com/ansible-collections/community.general/pull/5612).
+- redhat_subscription - add a ``server_proxy_scheme`` parameter to configure the scheme for the proxy server (https://github.com/ansible-collections/community.general/pull/5662).
+- ssh_config - refactor code to module util to fix sanity check (https://github.com/ansible-collections/community.general/pull/5720).
+- sudoers - adds ``host`` parameter for setting hostname restrictions in sudoers rules (https://github.com/ansible-collections/community.general/issues/5702).
+
+Deprecated Features
+-------------------
+
+- manageiq_policies - deprecate ``state=list`` in favour of using ``community.general.manageiq_policies_info`` (https://github.com/ansible-collections/community.general/pull/5721).
+- rax - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_cbs - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_cbs_attachments - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_cdb - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_cdb_database - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_cdb_user - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_clb - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_clb_nodes - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_clb_ssl - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_dns - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_dns_record - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_facts - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_files - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_files_objects - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_identity - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_keypair - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_meta - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_mon_alarm - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_mon_check - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_mon_entity - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_mon_notification - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_mon_notification_plan - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_network - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_queue - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_scaling_group - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+- rax_scaling_policy - module relies on deprecates library ``pyrax``. Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+
+Bugfixes
+--------
+
+- ansible_galaxy_install - set default to raise exception if command's return code is different from zero (https://github.com/ansible-collections/community.general/pull/5680).
+- ansible_galaxy_install - try ``C.UTF-8`` and then fall back to ``en_US.UTF-8`` before failing (https://github.com/ansible-collections/community.general/pull/5680).
+- gitlab_group_variables - fix dropping variables accidentally when GitLab introduced new properties (https://github.com/ansible-collections/community.general/pull/5667).
+- gitlab_project_variables - fix dropping variables accidentally when GitLab introduced new properties (https://github.com/ansible-collections/community.general/pull/5667).
+- lxc_container - fix the arguments of the lxc command which broke the creation and cloning of containers (https://github.com/ansible-collections/community.general/issues/5578).
+- opkg - fix issue that ``force=reinstall`` would not reinstall an existing package (https://github.com/ansible-collections/community.general/pull/5705).
+- proxmox_disk - fixed possible issues with redundant ``vmid`` parameter (https://github.com/ansible-collections/community.general/issues/5492, https://github.com/ansible-collections/community.general/pull/5672).
+- proxmox_nic - fixed possible issues with redundant ``vmid`` parameter (https://github.com/ansible-collections/community.general/issues/5492, https://github.com/ansible-collections/community.general/pull/5672).
+- unixy callback plugin - fix typo introduced when updating to use Ansible's configuration manager for handling options (https://github.com/ansible-collections/community.general/issues/5600).
+
 v6.1.0
 ======
 

changelogs/changelog.yaml

@@ -754,3 +754,132 @@ releases:
       name: keycloak_clientsecret_regenerate
       namespace: ''
     release_date: '2022-12-06'
+  6.2.0:
+    changes:
+      bugfixes:
+      - ansible_galaxy_install - set default to raise exception if command's return
+        code is different from zero (https://github.com/ansible-collections/community.general/pull/5680).
+      - ansible_galaxy_install - try ``C.UTF-8`` and then fall back to ``en_US.UTF-8``
+        before failing (https://github.com/ansible-collections/community.general/pull/5680).
+      - gitlab_group_variables - fix dropping variables accidentally when GitLab introduced
+        new properties (https://github.com/ansible-collections/community.general/pull/5667).
+      - gitlab_project_variables - fix dropping variables accidentally when GitLab
+        introduced new properties (https://github.com/ansible-collections/community.general/pull/5667).
+      - lxc_container - fix the arguments of the lxc command which broke the creation
+        and cloning of containers (https://github.com/ansible-collections/community.general/issues/5578).
+      - opkg - fix issue that ``force=reinstall`` would not reinstall an existing
+        package (https://github.com/ansible-collections/community.general/pull/5705).
+      - proxmox_disk - fixed possible issues with redundant ``vmid`` parameter (https://github.com/ansible-collections/community.general/issues/5492,
+        https://github.com/ansible-collections/community.general/pull/5672).
+      - proxmox_nic - fixed possible issues with redundant ``vmid`` parameter (https://github.com/ansible-collections/community.general/issues/5492,
+        https://github.com/ansible-collections/community.general/pull/5672).
+      - unixy callback plugin - fix typo introduced when updating to use Ansible's
+        configuration manager for handling options (https://github.com/ansible-collections/community.general/issues/5600).
+      deprecated_features:
+      - manageiq_policies - deprecate ``state=list`` in favour of using ``community.general.manageiq_policies_info``
+        (https://github.com/ansible-collections/community.general/pull/5721).
+      - rax - module relies on deprecates library ``pyrax``. Unless maintainers step
+        up to work on the module, it will be marked as deprecated in community.general
+        7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_cbs - module relies on deprecates library ``pyrax``. Unless maintainers
+        step up to work on the module, it will be marked as deprecated in community.general
+        7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_cbs_attachments - module relies on deprecates library ``pyrax``. Unless
+        maintainers step up to work on the module, it will be marked as deprecated
+        in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_cdb - module relies on deprecates library ``pyrax``. Unless maintainers
+        step up to work on the module, it will be marked as deprecated in community.general
+        7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_cdb_database - module relies on deprecates library ``pyrax``. Unless maintainers
+        step up to work on the module, it will be marked as deprecated in community.general
+        7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_cdb_user - module relies on deprecates library ``pyrax``. Unless maintainers
+        step up to work on the module, it will be marked as deprecated in community.general
+        7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_clb - module relies on deprecates library ``pyrax``. Unless maintainers
+        step up to work on the module, it will be marked as deprecated in community.general
+        7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_clb_nodes - module relies on deprecates library ``pyrax``. Unless maintainers
+        step up to work on the module, it will be marked as deprecated in community.general
+        7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_clb_ssl - module relies on deprecates library ``pyrax``. Unless maintainers
+        step up to work on the module, it will be marked as deprecated in community.general
+        7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_dns - module relies on deprecates library ``pyrax``. Unless maintainers
+        step up to work on the module, it will be marked as deprecated in community.general
+        7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_dns_record - module relies on deprecates library ``pyrax``. Unless maintainers
+        step up to work on the module, it will be marked as deprecated in community.general
+        7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_facts - module relies on deprecates library ``pyrax``. Unless maintainers
+        step up to work on the module, it will be marked as deprecated in community.general
+        7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_files - module relies on deprecates library ``pyrax``. Unless maintainers
+        step up to work on the module, it will be marked as deprecated in community.general
+        7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_files_objects - module relies on deprecates library ``pyrax``. Unless
+        maintainers step up to work on the module, it will be marked as deprecated
+        in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_identity - module relies on deprecates library ``pyrax``. Unless maintainers
+        step up to work on the module, it will be marked as deprecated in community.general
+        7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_keypair - module relies on deprecates library ``pyrax``. Unless maintainers
+        step up to work on the module, it will be marked as deprecated in community.general
+        7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_meta - module relies on deprecates library ``pyrax``. Unless maintainers
+        step up to work on the module, it will be marked as deprecated in community.general
+        7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_mon_alarm - module relies on deprecates library ``pyrax``. Unless maintainers
+        step up to work on the module, it will be marked as deprecated in community.general
+        7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_mon_check - module relies on deprecates library ``pyrax``. Unless maintainers
+        step up to work on the module, it will be marked as deprecated in community.general
+        7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_mon_entity - module relies on deprecates library ``pyrax``. Unless maintainers
+        step up to work on the module, it will be marked as deprecated in community.general
+        7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_mon_notification - module relies on deprecates library ``pyrax``. Unless
+        maintainers step up to work on the module, it will be marked as deprecated
+        in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_mon_notification_plan - module relies on deprecates library ``pyrax``.
+        Unless maintainers step up to work on the module, it will be marked as deprecated
+        in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_network - module relies on deprecates library ``pyrax``. Unless maintainers
+        step up to work on the module, it will be marked as deprecated in community.general
+        7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_queue - module relies on deprecates library ``pyrax``. Unless maintainers
+        step up to work on the module, it will be marked as deprecated in community.general
+        7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_scaling_group - module relies on deprecates library ``pyrax``. Unless
+        maintainers step up to work on the module, it will be marked as deprecated
+        in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      - rax_scaling_policy - module relies on deprecates library ``pyrax``. Unless
+        maintainers step up to work on the module, it will be marked as deprecated
+        in community.general 7.0.0 and removed in version 9.0.0 (https://github.com/ansible-collections/community.general/pull/5733).
+      minor_changes:
+      - opkg - allow installing a package in a certain version (https://github.com/ansible-collections/community.general/pull/5688).
+      - proxmox - added new module parameter ``tags`` for use with PVE 7+ (https://github.com/ansible-collections/community.general/pull/5714).
+      - puppet - refactored module to use ``CmdRunner`` for executing ``puppet`` (https://github.com/ansible-collections/community.general/pull/5612).
+      - redhat_subscription - add a ``server_proxy_scheme`` parameter to configure
+        the scheme for the proxy server (https://github.com/ansible-collections/community.general/pull/5662).
+      - ssh_config - refactor code to module util to fix sanity check (https://github.com/ansible-collections/community.general/pull/5720).
+      - sudoers - adds ``host`` parameter for setting hostname restrictions in sudoers
+        rules (https://github.com/ansible-collections/community.general/issues/5702).
+      release_summary: Regular bugfix and feature release.
+    fragments:
+    - 5612-puppet-cmd-runner.yml
+    - 5659-fix-lxc_container-command.yml
+    - 5662-redhat_subscription-server_proxy_scheme.yaml
+    - 5666-gitlab-variables.yml
+    - 5672-proxmox.yml
+    - 5680-ansible_galaxy_install-fx-locale.yaml
+    - 5688-opkg-module-install-certain-version.yml
+    - 5703-sudoers-host-support.yml
+    - 5705-opkg-fix-force-reinstall.yml
+    - 5714-proxmox-lxc-tag-support.yml
+    - 5720-ssh_config-plugin-sanity.yml
+    - 5721-manageiq-policies-deprecate-list-state.yaml
+    - 5733-rax-deprecation-notice.yml
+    - 5744-unixy-callback-fix-config-manager-typo.yml
+    - 6.2.0.yml
+    release_date: '2023-01-04'

galaxy.yml

@@ -5,7 +5,7 @@
 
 namespace: community
 name: general
-version: 6.1.0
+version: 6.2.0
 readme: README.md
 authors:
   - Ansible (https://github.com/ansible)

plugins/callback/unixy.py

@@ -142,7 +142,7 @@ class CallbackModule(CallbackModule_default):
             display_color = C.COLOR_CHANGED
             task_result = self._process_result_output(result, msg)
             self._display.display("  " + task_result, display_color)
-        elif self.get('display_ok_hosts'):
+        elif self.get_option('display_ok_hosts'):
             task_result = self._process_result_output(result, msg)
             self._display.display("  " + task_result, display_color)
 

plugins/inventory/lxd.py

@@ -55,6 +55,11 @@ DOCUMENTATION = r'''
             type: str
             default: none
             choices: [ 'STOPPED', 'STARTING', 'RUNNING', 'none' ]
+        project:
+            description: Filter the instance according to the given project.
+            type: str
+            default: default
+            version_added: 6.2.0
         type_filter:
             description:
             - Filter the instances by type C(virtual-machine), C(container) or C(both).
@@ -140,6 +145,9 @@ groupby:
   vlan666:
     type: vlanid
     attribute: 666
+  projectInternals:
+    type: project
+    attribute: internals
 '''
 
 import binascii
@@ -153,6 +161,7 @@ from ansible.module_utils.common.text.converters import to_native, to_text
 from ansible.module_utils.common.dict_transformations import dict_merge
 from ansible.module_utils.six import raise_from
 from ansible.errors import AnsibleError, AnsibleParserError
+from ansible.module_utils.six.moves.urllib.parse import urlencode
 from ansible_collections.community.general.plugins.module_utils.lxd import LXDClient, LXDClientException
 
 try:
@@ -330,7 +339,15 @@ class InventoryModule(BaseInventoryPlugin):
         #        "status_code": 200,
         #        "type": "sync"
         #      }
-        instances = self.socket.do('GET', '/1.0/instances')
+        url = '/1.0/instances'
+        if self.project:
+            url = url + '?{0}'.format(urlencode(dict(project=self.project)))
+
+        instances = self.socket.do('GET', url)
+
+        if self.project:
+            return [m.split('/')[3].split('?')[0] for m in instances['metadata']]
+
         return [m.split('/')[3] for m in instances['metadata']]
 
     def _get_config(self, branch, name):
@@ -351,9 +368,11 @@ class InventoryModule(BaseInventoryPlugin):
             dict(config): Config of the instance"""
         config = {}
         if isinstance(branch, (tuple, list)):
-            config[name] = {branch[1]: self.socket.do('GET', '/1.0/{0}/{1}/{2}'.format(to_native(branch[0]), to_native(name), to_native(branch[1])))}
+            config[name] = {branch[1]: self.socket.do(
+                'GET', '/1.0/{0}/{1}/{2}?{3}'.format(to_native(branch[0]), to_native(name), to_native(branch[1]), urlencode(dict(project=self.project))))}
         else:
-            config[name] = {branch: self.socket.do('GET', '/1.0/{0}/{1}'.format(to_native(branch), to_native(name)))}
+            config[name] = {branch: self.socket.do(
+                'GET', '/1.0/{0}/{1}?{2}'.format(to_native(branch), to_native(name), urlencode(dict(project=self.project))))}
         return config
 
     def get_instance_data(self, names):
@@ -583,6 +602,8 @@ class InventoryModule(BaseInventoryPlugin):
             self._set_data_entry(instance_name, 'network_interfaces', self.extract_network_information_from_instance_config(instance_name))
             self._set_data_entry(instance_name, 'preferred_interface', self.get_prefered_instance_network_interface(instance_name))
             self._set_data_entry(instance_name, 'vlan_ids', self.get_instance_vlans(instance_name))
+            self._set_data_entry(instance_name, 'project', self._get_data_entry(
+                'instances/{0}/instances/metadata/project'.format(instance_name)))
 
     def build_inventory_network(self, instance_name):
         """Add the network interfaces of the instance to the inventory
@@ -686,6 +707,8 @@ class InventoryModule(BaseInventoryPlugin):
             # add VLAN_ID information
             if self._get_data_entry('inventory/{0}/vlan_ids'.format(instance_name)):
                 self.inventory.set_variable(instance_name, 'ansible_lxd_vlan_ids', self._get_data_entry('inventory/{0}/vlan_ids'.format(instance_name)))
+            # add project
+            self.inventory.set_variable(instance_name, 'ansible_lxd_project', self._get_data_entry('inventory/{0}/project'.format(instance_name)))
 
     def build_inventory_groups_location(self, group_name):
         """create group by attribute: location
@@ -761,6 +784,28 @@ class InventoryModule(BaseInventoryPlugin):
                             # Ignore invalid IP addresses returned by lxd
                             pass
 
+    def build_inventory_groups_project(self, group_name):
+        """create group by attribute: project
+
+        Args:
+            str(group_name): Group name
+        Kwargs:
+            None
+        Raises:
+            None
+        Returns:
+            None"""
+        # maybe we just want to expand one group
+        if group_name not in self.inventory.groups:
+            self.inventory.add_group(group_name)
+
+        gen_instances = [
+            instance_name for instance_name in self.inventory.hosts
+            if 'ansible_lxd_project' in self.inventory.get_host(instance_name).get_vars()]
+        for instance_name in gen_instances:
+            if self.groupby[group_name].get('attribute').lower() == self.inventory.get_host(instance_name).get_vars().get('ansible_lxd_project'):
+                self.inventory.add_child(group_name, instance_name)
+
     def build_inventory_groups_os(self, group_name):
         """create group by attribute: os
 
@@ -899,6 +944,7 @@ class InventoryModule(BaseInventoryPlugin):
                 * 'profile'
                 * 'vlanid'
                 * 'type'
+                * 'project'
 
             Args:
                 str(group_name): Group name
@@ -926,6 +972,8 @@ class InventoryModule(BaseInventoryPlugin):
                 self.build_inventory_groups_vlanid(group_name)
             elif self.groupby[group_name].get('type') == 'type':
                 self.build_inventory_groups_type(group_name)
+            elif self.groupby[group_name].get('type') == 'project':
+                self.build_inventory_groups_project(group_name)
             else:
                 raise AnsibleParserError('Unknown group type: {0}'.format(to_native(group_name)))
 
@@ -1032,6 +1080,7 @@ class InventoryModule(BaseInventoryPlugin):
         try:
             self.client_key = self.get_option('client_key')
             self.client_cert = self.get_option('client_cert')
+            self.project = self.get_option('project')
             self.debug = self.DEBUG
             self.data = {}  # store for inventory-data
             self.groupby = self.get_option('groupby')

plugins/module_utils/gitlab.py

@@ -110,3 +110,14 @@ def gitlab_authentication(module):
             GitLab remove Session API now that private tokens are removed from user API endpoints since version 10.2." % to_native(e))
 
     return gitlab_instance
+
+
+def filter_returned_variables(gitlab_variables):
+    # pop properties we don't know
+    existing_variables = [dict(x.attributes) for x in gitlab_variables]
+    KNOWN = ['key', 'value', 'masked', 'protected', 'variable_type', 'environment_scope']
+    for item in existing_variables:
+        for key in list(item.keys()):
+            if key not in KNOWN:
+                item.pop(key)
+    return existing_variables

plugins/module_utils/puppet.py

@@ -0,0 +1,114 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2022, Alexei Znamensky <russoz@gmail.com>
+# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
+
+import os
+
+from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt
+
+
+_PUPPET_PATH_PREFIX = ["/opt/puppetlabs/bin"]
+
+
+def get_facter_dir():
+    if os.getuid() == 0:
+        return '/etc/facter/facts.d'
+    else:
+        return os.path.expanduser('~/.facter/facts.d')
+
+
+def _puppet_cmd(module):
+    return module.get_bin_path("puppet", False, _PUPPET_PATH_PREFIX)
+
+
+# If the `timeout` CLI command feature is removed,
+# Then we could add this as a fixed param to `puppet_runner`
+def ensure_agent_enabled(module):
+    runner = CmdRunner(
+        module,
+        command="puppet",
+        path_prefix=_PUPPET_PATH_PREFIX,
+        arg_formats=dict(
+            _agent_disabled=cmd_runner_fmt.as_fixed(['config', 'print', 'agent_disabled_lockfile']),
+        ),
+        check_rc=False,
+    )
+
+    rc, stdout, stderr = runner("_agent_disabled").run()
+    if os.path.exists(stdout.strip()):
+        module.fail_json(
+            msg="Puppet agent is administratively disabled.",
+            disabled=True)
+    elif rc != 0:
+        module.fail_json(
+            msg="Puppet agent state could not be determined.")
+
+
+def puppet_runner(module):
+
+    # Keeping backward compatibility, allow for running with the `timeout` CLI command.
+    # If this can be replaced with ansible `timeout` parameter in playbook,
+    # then this function could be removed.
+    def _prepare_base_cmd():
+        _tout_cmd = module.get_bin_path("timeout", False)
+        if _tout_cmd:
+            cmd = ["timeout", "-s", "9", module.params["timeout"], _puppet_cmd(module)]
+        else:
+            cmd = ["puppet"]
+        return cmd
+
+    def noop_func(v):
+        _noop = cmd_runner_fmt.as_map({
+            True: "--noop",
+            False: "--no-noop",
+        })
+        return _noop(module.check_mode or v)
+
+    _logdest_map = {
+        "syslog": ["--logdest", "syslog"],
+        "all": ["--logdest", "syslog", "--logdest", "console"],
+    }
+
+    @cmd_runner_fmt.unpack_args
+    def execute_func(execute, manifest):
+        if execute:
+            return ["--execute", execute]
+        else:
+            return [manifest]
+
+    runner = CmdRunner(
+        module,
+        command=_prepare_base_cmd(),
+        path_prefix=_PUPPET_PATH_PREFIX,
+        arg_formats=dict(
+            _agent_fixed=cmd_runner_fmt.as_fixed([
+                "agent", "--onetime", "--no-daemonize", "--no-usecacheonfailure",
+                "--no-splay", "--detailed-exitcodes", "--verbose", "--color", "0",
+            ]),
+            _apply_fixed=cmd_runner_fmt.as_fixed(["apply", "--detailed-exitcodes"]),
+            puppetmaster=cmd_runner_fmt.as_opt_val("--server"),
+            show_diff=cmd_runner_fmt.as_bool("--show-diff"),
+            confdir=cmd_runner_fmt.as_opt_val("--confdir"),
+            environment=cmd_runner_fmt.as_opt_val("--environment"),
+            tags=cmd_runner_fmt.as_func(lambda v: ["--tags", ",".join(v)]),
+            certname=cmd_runner_fmt.as_opt_eq_val("--certname"),
+            noop=cmd_runner_fmt.as_func(noop_func),
+            use_srv_records=cmd_runner_fmt.as_map({
+                True: "--usr_srv_records",
+                False: "--no-usr_srv_records",
+            }),
+            logdest=cmd_runner_fmt.as_map(_logdest_map, default=[]),
+            modulepath=cmd_runner_fmt.as_opt_eq_val("--modulepath"),
+            _execute=cmd_runner_fmt.as_func(execute_func),
+            summarize=cmd_runner_fmt.as_bool("--summarize"),
+            debug=cmd_runner_fmt.as_bool("--debug"),
+            verbose=cmd_runner_fmt.as_bool("--verbose"),
+        ),
+        check_rc=False,
+    )
+    return runner

plugins/module_utils/ssh.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Björn Andersson
+# Copyright (c) 2021, Ansible Project
+# Copyright (c) 2021, Abhijeet Kasurde <akasurde@redhat.com>
+# Copyright (c) 2022, Alexei Znamensky <russoz@gmail.com>
+# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
+
+import os
+
+
+def determine_config_file(user, config_file):
+    if user:
+        config_file = os.path.join(os.path.expanduser('~%s' % user), '.ssh', 'config')
+    elif config_file is None:
+        config_file = '/etc/ssh/ssh_config'
+    return config_file

plugins/modules/ansible_galaxy_install.py

@@ -20,6 +20,10 @@ notes:
   - >
     B(Ansible 2.9/2.10): The C(ansible-galaxy) command changed significantly between Ansible 2.9 and
     ansible-base 2.10 (later ansible-core 2.11). See comments in the parameters.
+  - >
+    The module will try and run using the C(C.UTF-8) locale.
+    If that fails, it will try C(en_US.UTF-8).
+    If that one also fails, the module will fail.
 requirements:
   - Ansible 2.9, ansible-base 2.10, or ansible-core 2.11 or newer
 options:
@@ -185,7 +189,7 @@ RETURN = """
 import re
 
 from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt as fmt
-from ansible_collections.community.general.plugins.module_utils.module_helper import ModuleHelper
+from ansible_collections.community.general.plugins.module_utils.module_helper import ModuleHelper, ModuleHelperException
 
 
 class AnsibleGalaxyInstall(ModuleHelper):
@@ -226,11 +230,17 @@ class AnsibleGalaxyInstall(ModuleHelper):
         version=fmt.as_bool("--version"),
         name=fmt.as_list(),
     )
-    force_lang = "en_US.UTF-8"
+
-    check_rc = True
+    def _make_runner(self, lang):
+        return CmdRunner(self.module, command=self.command, arg_formats=self.command_args_formats, force_lang=lang, check_rc=True)
 
     def _get_ansible_galaxy_version(self):
+        class UnsupportedLocale(ModuleHelperException):
+            pass
+
         def process(rc, out, err):
+            if (rc != 0 and "unsupported locale setting" in err) or (rc == 0 and "cannot change locale" in err):
+                raise UnsupportedLocale(msg=err)
             line = out.splitlines()[0]
             match = self._RE_GALAXY_VERSION.match(line)
             if not match:
@@ -239,12 +249,18 @@ class AnsibleGalaxyInstall(ModuleHelper):
             version = tuple(int(x) for x in version.split('.')[:3])
             return version
 
-        with self.runner("version", check_rc=True, output_process=process) as ctx:
+        try:
-            return ctx.run(version=True)
+            runner = self._make_runner("C.UTF-8")
+            with runner("version", check_rc=False, output_process=process) as ctx:
+                return runner, ctx.run(version=True)
+        except UnsupportedLocale as e:
+            runner = self._make_runner("en_US.UTF-8")
+            with runner("version", check_rc=True, output_process=process) as ctx:
+                return runner, ctx.run(version=True)
 
     def __init_module__(self):
-        self.runner = CmdRunner(self.module, command=self.command, arg_formats=self.command_args_formats, force_lang=self.force_lang)
+        # self.runner = CmdRunner(self.module, command=self.command, arg_formats=self.command_args_formats, force_lang=self.force_lang)
-        self.ansible_version = self._get_ansible_galaxy_version()
+        self.runner, self.ansible_version = self._get_ansible_galaxy_version()
         if self.ansible_version < (2, 11) and not self.vars.ack_min_ansiblecore211:
             self.module.deprecate(
                 "Support for Ansible 2.9 and ansible-base 2.10 is being deprecated. "
@@ -339,11 +355,12 @@ class AnsibleGalaxyInstall(ModuleHelper):
             self._setup210plus()
         with self.runner("type galaxy_cmd force no_deps dest requirements_file name", output_process=process) as ctx:
             ctx.run(galaxy_cmd="install")
+            if self.verbosity > 2:
+                self.vars.set("run_info", ctx.run_info)
 
 
 def main():
-    galaxy = AnsibleGalaxyInstall()
+    AnsibleGalaxyInstall.execute()
-    galaxy.run()
 
 
 if __name__ == '__main__':

plugins/modules/github_release.py

@@ -108,17 +108,8 @@ EXAMPLES = '''
 '''
 
 RETURN = '''
-create_release:
+tag:
-    description:
+    description: Version of the created/latest release.
-    - Version of the created release
-    - "For Ansible version 2.5 and later, if specified release version already exists, then State is unchanged"
-    - "For Ansible versions prior to 2.5, if specified release version already exists, then State is skipped"
-    type: str
-    returned: success
-    sample: 1.1.0
-
-latest_release:
-    description: Version of the latest release
     type: str
     returned: success
     sample: 1.1.0

plugins/modules/gitlab_group_variable.py

@@ -165,7 +165,7 @@ from ansible.module_utils.six import string_types
 from ansible.module_utils.six import integer_types
 
 from ansible_collections.community.general.plugins.module_utils.gitlab import (
-    auth_argument_spec, gitlab_authentication, ensure_gitlab_package
+    auth_argument_spec, gitlab_authentication, ensure_gitlab_package, filter_returned_variables
 )
 
 
@@ -296,11 +296,7 @@ def native_python_main(this_gitlab, purge, requested_variables, state, module):
     before = [x.attributes for x in gitlab_keys]
 
     gitlab_keys = this_gitlab.list_all_group_variables()
-    existing_variables = [x.attributes for x in gitlab_keys]
+    existing_variables = filter_returned_variables(gitlab_keys)
-
-    # preprocessing:filter out and enrich before compare
-    for item in existing_variables:
-        item.pop('group_id')
 
     for item in requested_variables:
         item['key'] = item.pop('name')
@@ -331,9 +327,7 @@ def native_python_main(this_gitlab, purge, requested_variables, state, module):
         if purge:
             # refetch and filter
             gitlab_keys = this_gitlab.list_all_group_variables()
-            existing_variables = [x.attributes for x in gitlab_keys]
+            existing_variables = filter_returned_variables(gitlab_keys)
-            for item in existing_variables:
-                item.pop('group_id')
 
             remove = [x for x in existing_variables if x not in requested_variables]
             for item in remove:

plugins/modules/gitlab_project_variable.py

@@ -189,7 +189,7 @@ except Exception:
     HAS_GITLAB_PACKAGE = False
 
 from ansible_collections.community.general.plugins.module_utils.gitlab import (
-    auth_argument_spec, gitlab_authentication, ensure_gitlab_package
+    auth_argument_spec, gitlab_authentication, ensure_gitlab_package, filter_returned_variables
 )
 
 
@@ -255,9 +255,11 @@ class GitlabProjectVariables(object):
             return True
 
         var = {
-            "key": var_obj.get('key'), "value": var_obj.get('value'),
+            "key": var_obj.get('key'),
-            "masked": var_obj.get('masked'), "protected": var_obj.get('protected'),
+            "value": var_obj.get('value'),
-            "variable_type": var_obj.get('variable_type')
+            "masked": var_obj.get('masked'),
+            "protected": var_obj.get('protected'),
+            "variable_type": var_obj.get('variable_type'),
         }
 
         if var_obj.get('environment_scope') is not None:
@@ -319,12 +321,9 @@ def native_python_main(this_gitlab, purge, requested_variables, state, module):
     before = [x.attributes for x in gitlab_keys]
 
     gitlab_keys = this_gitlab.list_all_project_variables()
-    existing_variables = [x.attributes for x in gitlab_keys]
+    existing_variables = filter_returned_variables(gitlab_keys)
-
-    # preprocessing:filter out and enrich before compare
-    for item in existing_variables:
-        item.pop('project_id')
 
+    # filter out and enrich before compare
     for item in requested_variables:
         item['key'] = item.pop('name')
         item['value'] = str(item.get('value'))
@@ -354,9 +353,7 @@ def native_python_main(this_gitlab, purge, requested_variables, state, module):
         if purge:
             # refetch and filter
             gitlab_keys = this_gitlab.list_all_project_variables()
-            existing_variables = [x.attributes for x in gitlab_keys]
+            existing_variables = filter_returned_variables(gitlab_keys)
-            for item in existing_variables:
-                item.pop('project_id')
 
             remove = [x for x in existing_variables if x not in requested_variables]
             for item in remove:
@@ -409,7 +406,7 @@ def main():
             masked=dict(type='bool', default=False),
             protected=dict(type='bool', default=False),
             environment_scope=dict(type='str', default='*'),
-            variable_type=dict(type='str', default='env_var', choices=["env_var", "file"])
+            variable_type=dict(type='str', default='env_var', choices=["env_var", "file"]),
         )),
         state=dict(type='str', default="present", choices=["absent", "present"]),
     )

plugins/modules/htpasswd.py

@@ -41,9 +41,12 @@ options:
     description:
       - Encryption scheme to be used.  As well as the four choices listed
         here, you can also use any other hash supported by passlib, such as
-        md5_crypt and sha256_crypt, which are linux passwd hashes.  If you
+        C(portable_apache22) and C(host_apache24); or C(md5_crypt) and C(sha256_crypt),
-        do so the password file will not be compatible with Apache or Nginx
+        which are Linux passwd hashes.  Only some schemes in addition to
-      - 'Some of the available choices might be: C(apr_md5_crypt), C(des_crypt), C(ldap_sha1), C(plaintext)'
+        the four choices below will be compatible with Apache or Nginx, and
+        supported schemes depend on passlib version and its dependencies.
+      - See U(https://passlib.readthedocs.io/en/stable/lib/passlib.apache.html#passlib.apache.HtpasswdFile) parameter C(default_scheme).
+      - 'Some of the available choices might be: C(apr_md5_crypt), C(des_crypt), C(ldap_sha1), C(plaintext).'
   state:
     type: str
     required: false

plugins/modules/lxc_container.py

@@ -677,7 +677,7 @@ class LxcContainerManagement(object):
 
         false_values = BOOLEANS_FALSE.union([None, ''])
         result = dict(
-            (k, v)
+            (v, self.module.params[k])
             for k, v in variables.items()
             if self.module.params[k] not in false_values
         )

plugins/modules/manageiq_policies.py

@@ -27,7 +27,10 @@ options:
     description:
       - C(absent) - policy_profiles should not exist,
       - C(present) - policy_profiles should exist,
-      - C(list) - list current policy_profiles and policies.
+      - >
+        C(list) - list current policy_profiles and policies.
+        This state is deprecated and will be removed 8.0.0.
+        Please use the module M(community.general.manageiq_policies_info) instead.
     choices: ['absent', 'present', 'list']
     default: 'present'
   policy_profiles:
@@ -163,6 +166,13 @@ def main():
     resource_name = module.params['resource_name']
     state = module.params['state']
 
+    if state == "list":
+        module.deprecate(
+            'The value "list" for "state" is deprecated. Please use community.general.manageiq_policies_info instead.',
+            version='8.0.0',
+            collection_name='community.general'
+        )
+
     # get the action and resource type
     action = actions[state]
     resource_type = manageiq_entities()[resource_type_key]

plugins/modules/opkg.py

@@ -22,6 +22,9 @@ options:
     name:
         description:
             - Name of package(s) to install/remove.
+            - C(NAME=VERSION) syntax is also supported to install a package
+              in a certain version. See the examples. This is supported since
+              community.general 6.2.0.
         aliases: [pkg]
         required: true
         type: list
@@ -64,6 +67,11 @@ EXAMPLES = '''
     name: foo
     state: present
 
+- name: Install foo in version 1.2
+  community.general.opkg:
+    name: foo=1.2
+    state: present
+
 - name: Update cache and install foo
   community.general.opkg:
     name: foo
@@ -96,22 +104,39 @@ from ansible.module_utils.six.moves import shlex_quote
 def update_package_db(module, opkg_path):
     """ Updates packages list. """
 
-    rc, out, err = module.run_command("%s update" % opkg_path)
+    rc, out, err = module.run_command([opkg_path, "update"])
 
     if rc != 0:
         module.fail_json(msg="could not update package db")
 
 
-def query_package(module, opkg_path, name, state="present"):
+def query_package(module, opkg_path, name, version=None, state="present"):
     """ Returns whether a package is installed or not. """
 
     if state == "present":
+        rc, out, err = module.run_command([opkg_path, "list-installed", name])
+        if rc != 0:
+            return False
+        # variable out is one line if the package is installed:
+        # "NAME - VERSION - DESCRIPTION"
+        if version is not None:
+            if not out.startswith("%s - %s " % (name, version)):
+                return False
+        else:
+            if not out.startswith(name + " "):
+                return False
+        return True
+    else:
+        raise NotImplementedError()
 
-        rc, out, err = module.run_command("%s list-installed | grep -q \"^%s \"" % (shlex_quote(opkg_path), shlex_quote(name)), use_unsafe_shell=True)
-        if rc == 0:
-            return True
 
-        return False
+def split_name_and_version(module, package):
+    """ Split the name and the version when using the NAME=VERSION syntax """
+    splitted = package.split('=', 1)
+    if len(splitted) == 1:
+        return splitted[0], None
+    else:
+        return splitted[0], splitted[1]
 
 
 def remove_packages(module, opkg_path, packages):
@@ -125,11 +150,16 @@ def remove_packages(module, opkg_path, packages):
     remove_c = 0
     # Using a for loop in case of error, we can report the package that failed
     for package in packages:
+        package, version = split_name_and_version(module, package)
+
         # Query the package first, to see if we even need to remove
         if not query_package(module, opkg_path, package):
             continue
 
-        rc, out, err = module.run_command("%s remove %s %s" % (opkg_path, force, package))
+        if force:
+            rc, out, err = module.run_command([opkg_path, "remove", force, package])
+        else:
+            rc, out, err = module.run_command([opkg_path, "remove", package])
 
         if query_package(module, opkg_path, package):
             module.fail_json(msg="failed to remove %s: %s" % (package, out))
@@ -154,13 +184,23 @@ def install_packages(module, opkg_path, packages):
     install_c = 0
 
     for package in packages:
-        if query_package(module, opkg_path, package):
+        package, version = split_name_and_version(module, package)
+
+        if query_package(module, opkg_path, package, version) and (force != '--force-reinstall'):
             continue
 
-        rc, out, err = module.run_command("%s install %s %s" % (opkg_path, force, package))
+        if version is not None:
+            version_str = "=%s" % version
+        else:
+            version_str = ""
 
-        if not query_package(module, opkg_path, package):
+        if force:
-            module.fail_json(msg="failed to install %s: %s" % (package, out))
+            rc, out, err = module.run_command([opkg_path, "install", force, package + version_str])
+        else:
+            rc, out, err = module.run_command([opkg_path, "install", package + version_str])
+
+        if not query_package(module, opkg_path, package, version):
+            module.fail_json(msg="failed to install %s%s: %s" % (package, version_str, out))
 
         install_c += 1
 

plugins/modules/proxmox.py

@@ -106,6 +106,14 @@ options:
     description:
       - sets DNS search domain for a container
     type: str
+  tags:
+    description:
+      - List of tags to apply to the container.
+      - Tags must start with C([a-z0-9_]) followed by zero or more of the following characters C([a-z0-9_-+.]).
+      - Tags are only available in Proxmox 7+.
+    type: list
+    elements: str
+    version_added: 6.2.0
   timeout:
     description:
       - timeout for operations
@@ -391,6 +399,7 @@ EXAMPLES = r'''
     state: absent
 '''
 
+import re
 import time
 
 from ansible_collections.community.general.plugins.module_utils.version import LooseVersion
@@ -415,11 +424,25 @@ class ProxmoxLxcAnsible(ProxmoxAnsible):
         return config['template']
 
     def create_instance(self, vmid, node, disk, storage, cpus, memory, swap, timeout, clone, **kwargs):
+
+        # Version limited features
+        minimum_version = {
+            'tags': 7,
+        }
         proxmox_node = self.proxmox_api.nodes(node)
 
         # Remove all empty kwarg entries
         kwargs = dict((k, v) for k, v in kwargs.items() if v is not None)
 
+        version = self.version()
+        pve_major_version = 3 if version < LooseVersion('4.0') else version.version[0]
+
+        # Fail on unsupported features
+        for option, version in minimum_version.items():
+            if pve_major_version < version and option in kwargs:
+                self.module.fail_json(changed=False, msg="Feature {option} is only supported in PVE {version}+, and you're using PVE {pve_major_version}".
+                                      format(option=option, version=version, pve_major_version=pve_major_version))
+
         if VZ_TYPE == 'lxc':
             kwargs['cpulimit'] = cpus
             kwargs['rootfs'] = disk
@@ -437,6 +460,14 @@ class ProxmoxLxcAnsible(ProxmoxAnsible):
             kwargs['cpus'] = cpus
             kwargs['disk'] = disk
 
+        # LXC tags are expected to be valid and presented as a comma/semi-colon delimited string
+        if 'tags' in kwargs:
+            re_tag = re.compile(r'^[a-z0-9_][a-z0-9_\-\+\.]*$')
+            for tag in kwargs['tags']:
+                if not re_tag.match(tag):
+                    self.module.fail_json(msg='%s is not a valid tag' % tag)
+            kwargs['tags'] = ",".join(kwargs['tags'])
+
         if clone is not None:
             if VZ_TYPE != 'lxc':
                 self.module.fail_json(changed=False, msg="Clone operator is only supported for LXC enabled proxmox clusters.")
@@ -569,6 +600,7 @@ def main():
         proxmox_default_behavior=dict(type='str', default='no_defaults', choices=['compatibility', 'no_defaults']),
         clone=dict(type='int'),
         clone_type=dict(default='opportunistic', choices=['full', 'linked', 'opportunistic']),
+        tags=dict(type='list', elements='str')
     )
     module_args.update(proxmox_args)
 
@@ -674,7 +706,8 @@ def main():
                                     features=",".join(module.params['features']) if module.params['features'] is not None else None,
                                     unprivileged=ansible_to_proxmox_bool(module.params['unprivileged']),
                                     description=module.params['description'],
-                                    hookscript=module.params['hookscript'])
+                                    hookscript=module.params['hookscript'],
+                                    tags=module.params['tags'])
 
             module.exit_json(changed=True, msg="Deployed VM %s from template %s" % (vmid, module.params['ostemplate']))
         except Exception as e:

plugins/modules/proxmox_disk.py

@@ -699,7 +699,7 @@ def main():
                 module.exit_json(changed=False, vmid=vmid, msg='Disk %s already detached in VM %s' % (disk, vmid))
             if disk not in vm_config:
                 module.exit_json(changed=False, vmid=vmid, msg="Disk %s not present in VM %s config" % (disk, vmid))
-            proxmox.proxmox_api.nodes(vm['node']).qemu(vmid).unlink.put(vmid=vmid, idlist=disk, force=0)
+            proxmox.proxmox_api.nodes(vm['node']).qemu(vmid).unlink.put(idlist=disk, force=0)
             module.exit_json(changed=True, vmid=vmid, msg="Disk %s detached from VM %s" % (disk, vmid))
         except Exception as e:
             module.fail_json(msg="Failed to detach disk %s from VM %s with exception: %s" % (disk, vmid, str(e)))
@@ -734,7 +734,7 @@ def main():
         try:
             if disk not in vm_config:
                 module.exit_json(changed=False, vmid=vmid, msg="Disk %s is already absent in VM %s" % (disk, vmid))
-            proxmox.proxmox_api.nodes(vm['node']).qemu(vmid).unlink.put(vmid=vmid, idlist=disk, force=1)
+            proxmox.proxmox_api.nodes(vm['node']).qemu(vmid).unlink.put(idlist=disk, force=1)
             module.exit_json(changed=True, vmid=vmid, msg="Disk %s removed from VM %s" % (disk, vmid))
         except Exception as e:
             module.fail_json(vmid=vmid, msg='Unable to remove disk %s from VM %s: %s' % (disk, vmid, str(e)))

plugins/modules/proxmox_nic.py

@@ -223,7 +223,7 @@ class ProxmoxNicAnsible(ProxmoxAnsible):
 
         if interface in vminfo:
             if not self.module.check_mode:
-                self.proxmox_api.nodes(vm['node']).qemu(vmid).config.set(vmid=vmid, delete=interface)
+                self.proxmox_api.nodes(vm['node']).qemu(vmid).config.set(delete=interface)
             return True
 
         return False

plugins/modules/puppet.py

@@ -152,15 +152,9 @@ import json
 import os
 import stat
 
+import ansible_collections.community.general.plugins.module_utils.puppet as puppet_utils
+
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.six.moves import shlex_quote
-
-
-def _get_facter_dir():
-    if os.getuid() == 0:
-        return '/etc/facter/facts.d'
-    else:
-        return os.path.expanduser('~/.facter/facts.d')
 
 
 def _write_structured_data(basedir, basename, data):
@@ -212,16 +206,6 @@ def main():
     )
     p = module.params
 
-    global PUPPET_CMD
-    PUPPET_CMD = module.get_bin_path("puppet", False, ['/opt/puppetlabs/bin'])
-
-    if not PUPPET_CMD:
-        module.fail_json(
-            msg="Could not find puppet. Please ensure it is installed.")
-
-    global TIMEOUT_CMD
-    TIMEOUT_CMD = module.get_bin_path("timeout", False)
-
     if p['manifest']:
         if not os.path.exists(p['manifest']):
             module.fail_json(
@@ -230,90 +214,24 @@ def main():
 
     # Check if puppet is disabled here
     if not p['manifest']:
-        rc, stdout, stderr = module.run_command(
+        puppet_utils.ensure_agent_enabled(module)
-            PUPPET_CMD + " config print agent_disabled_lockfile")
-        if os.path.exists(stdout.strip()):
-            module.fail_json(
-                msg="Puppet agent is administratively disabled.",
-                disabled=True)
-        elif rc != 0:
-            module.fail_json(
-                msg="Puppet agent state could not be determined.")
 
     if module.params['facts'] and not module.check_mode:
         _write_structured_data(
-            _get_facter_dir(),
+            puppet_utils.get_facter_dir(),
             module.params['facter_basename'],
             module.params['facts'])
 
-    if TIMEOUT_CMD:
+    runner = puppet_utils.puppet_runner(module)
-        base_cmd = "%(timeout_cmd)s -s 9 %(timeout)s %(puppet_cmd)s" % dict(
-            timeout_cmd=TIMEOUT_CMD,
-            timeout=shlex_quote(p['timeout']),
-            puppet_cmd=PUPPET_CMD)
-    else:
-        base_cmd = PUPPET_CMD
 
     if not p['manifest'] and not p['execute']:
-        cmd = ("%(base_cmd)s agent --onetime"
+        args_order = "_agent_fixed puppetmaster show_diff confdir environment tags certname noop use_srv_records"
-               " --no-daemonize --no-usecacheonfailure --no-splay"
+        with runner(args_order) as ctx:
-               " --detailed-exitcodes --verbose --color 0") % dict(base_cmd=base_cmd)
+            rc, stdout, stderr = ctx.run()
-        if p['puppetmaster']:
-            cmd += " --server %s" % shlex_quote(p['puppetmaster'])
-        if p['show_diff']:
-            cmd += " --show_diff"
-        if p['confdir']:
-            cmd += " --confdir %s" % shlex_quote(p['confdir'])
-        if p['environment']:
-            cmd += " --environment '%s'" % p['environment']
-        if p['tags']:
-            cmd += " --tags '%s'" % ','.join(p['tags'])
-        if p['certname']:
-            cmd += " --certname='%s'" % p['certname']
-        if module.check_mode:
-            cmd += " --noop"
-        elif 'noop' in p:
-            if p['noop']:
-                cmd += " --noop"
-            else:
-                cmd += " --no-noop"
-        if p['use_srv_records'] is not None:
-            if not p['use_srv_records']:
-                cmd += " --no-use_srv_records"
-            else:
-                cmd += " --use_srv_records"
     else:
-        cmd = "%s apply --detailed-exitcodes " % base_cmd
+        args_order = "_apply_fixed logdest modulepath environment certname tags noop _execute summarize debug verbose"
-        if p['logdest'] == 'syslog':
+        with runner(args_order) as ctx:
-            cmd += "--logdest syslog "
+            rc, stdout, stderr = ctx.run(_execute=[p['execute'], p['manifest']])
-        if p['logdest'] == 'all':
-            cmd += " --logdest syslog --logdest console"
-        if p['modulepath']:
-            cmd += "--modulepath='%s'" % p['modulepath']
-        if p['environment']:
-            cmd += "--environment '%s' " % p['environment']
-        if p['certname']:
-            cmd += " --certname='%s'" % p['certname']
-        if p['tags']:
-            cmd += " --tags '%s'" % ','.join(p['tags'])
-        if module.check_mode:
-            cmd += "--noop "
-        elif 'noop' in p:
-            if p['noop']:
-                cmd += " --noop"
-            else:
-                cmd += " --no-noop"
-        if p['execute']:
-            cmd += " --execute '%s'" % p['execute']
-        else:
-            cmd += " %s" % shlex_quote(p['manifest'])
-        if p['summarize']:
-            cmd += " --summarize"
-        if p['debug']:
-            cmd += " --debug"
-        if p['verbose']:
-            cmd += " --verbose"
-    rc, stdout, stderr = module.run_command(cmd)
 
     if rc == 0:
         # success
@@ -335,11 +253,11 @@ def main():
     elif rc == 124:
         # timeout
         module.exit_json(
-            rc=rc, msg="%s timed out" % cmd, stdout=stdout, stderr=stderr)
+            rc=rc, msg="%s timed out" % ctx.cmd, stdout=stdout, stderr=stderr)
     else:
         # failure
         module.fail_json(
-            rc=rc, msg="%s failed with return code: %d" % (cmd, rc),
+            rc=rc, msg="%s failed with return code: %d" % (ctx.cmd, rc),
             stdout=stdout, stderr=stderr)
 
 

plugins/modules/rax_cbs.py

@@ -13,7 +13,9 @@ DOCUMENTATION = '''
 module: rax_cbs
 short_description: Manipulate Rackspace Cloud Block Storage Volumes
 description:
-     - Manipulate Rackspace Cloud Block Storage Volumes
+  - Manipulate Rackspace Cloud Block Storage Volumes
+  - This module relies on the C(pyrax) package which is deprecated in favour of using Openstack API.
+  - Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0.
 options:
   description:
     type: str

plugins/modules/rax_cbs_attachments.py

@@ -13,7 +13,9 @@ DOCUMENTATION = '''
 module: rax_cbs_attachments
 short_description: Manipulate Rackspace Cloud Block Storage Volume Attachments
 description:
-     - Manipulate Rackspace Cloud Block Storage Volume Attachments
+  - Manipulate Rackspace Cloud Block Storage Volume Attachments
+  - This module relies on the C(pyrax) package which is deprecated in favour of using Openstack API.
+  - Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0.
 options:
   device:
     type: str

plugins/modules/rax_cdb.py

@@ -16,6 +16,8 @@ description:
   - creates / deletes or resize a Rackspace Cloud Databases instance
     and optionally waits for it to be 'running'. The name option needs to be
     unique since it's used to identify the instance.
+  - This module relies on the C(pyrax) package which is deprecated in favour of using Openstack API.
+  - Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0.
 options:
   name:
     type: str

plugins/modules/rax_cdb_database.py

@@ -13,6 +13,8 @@ module: rax_cdb_database
 short_description: Create / delete a database in the Cloud Databases
 description:
   - create / delete a database in the Cloud Databases.
+  - This module relies on the C(pyrax) package which is deprecated in favour of using Openstack API.
+  - Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0.
 options:
   cdb_id:
     type: str

plugins/modules/rax_cdb_user.py

@@ -14,6 +14,8 @@ module: rax_cdb_user
 short_description: Create / delete a Rackspace Cloud Database
 description:
   - create / delete a database in the Cloud Databases.
+  - This module relies on the C(pyrax) package which is deprecated in favour of using Openstack API.
+  - Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0.
 options:
   cdb_id:
     type: str

plugins/modules/rax_clb.py

@@ -13,7 +13,9 @@ DOCUMENTATION = '''
 module: rax_clb
 short_description: Create / delete a load balancer in Rackspace Public Cloud
 description:
-     - creates / deletes a Rackspace Public Cloud load balancer.
+  - creates / deletes a Rackspace Public Cloud load balancer.
+  - This module relies on the C(pyrax) package which is deprecated in favour of using Openstack API.
+  - Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0.
 options:
   algorithm:
     type: str

plugins/modules/rax_clb_nodes.py

@@ -13,7 +13,9 @@ DOCUMENTATION = '''
 module: rax_clb_nodes
 short_description: Add, modify and remove nodes from a Rackspace Cloud Load Balancer
 description:
-  - Adds, modifies and removes nodes from a Rackspace Cloud Load Balancer
+  - Adds, modifies and removes nodes from a Rackspace Cloud Load Balancer.
+  - This module relies on the C(pyrax) package which is deprecated in favour of using Openstack API.
+  - Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0.
 options:
   address:
     type: str

plugins/modules/rax_clb_ssl.py

@@ -12,7 +12,9 @@ DOCUMENTATION = '''
 module: rax_clb_ssl
 short_description: Manage SSL termination for a Rackspace Cloud Load Balancer
 description:
-- Set up, reconfigure, or remove SSL termination for an existing load balancer.
+  - Set up, reconfigure, or remove SSL termination for an existing load balancer.
+  - This module relies on the C(pyrax) package which is deprecated in favour of using Openstack API.
+  - Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0.
 options:
   loadbalancer:
     type: str

plugins/modules/rax_dns.py

@@ -13,7 +13,9 @@ DOCUMENTATION = '''
 module: rax_dns
 short_description: Manage domains on Rackspace Cloud DNS
 description:
-     - Manage domains on Rackspace Cloud DNS
+  - Manage domains on Rackspace Cloud DNS.
+  - This module relies on the C(pyrax) package which is deprecated in favour of using Openstack API.
+  - Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0.
 options:
   comment:
     type: str

plugins/modules/rax_dns_record.py

@@ -13,7 +13,9 @@ DOCUMENTATION = '''
 module: rax_dns_record
 short_description: Manage DNS records on Rackspace Cloud DNS
 description:
-     - Manage DNS records on Rackspace Cloud DNS
+  - Manage DNS records on Rackspace Cloud DNS.
+  - This module relies on the C(pyrax) package which is deprecated in favour of using Openstack API.
+  - Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0.
 options:
   comment:
     type: str

plugins/modules/rax_facts.py

@@ -14,6 +14,8 @@ module: rax_facts
 short_description: Gather facts for Rackspace Cloud Servers
 description:
   - Gather facts for Rackspace Cloud Servers.
+  - This module relies on the C(pyrax) package which is deprecated in favour of using Openstack API.
+  - Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0.
 options:
   address:
     type: str

plugins/modules/rax_files.py

@@ -13,7 +13,9 @@ DOCUMENTATION = '''
 module: rax_files
 short_description: Manipulate Rackspace Cloud Files Containers
 description:
-  - Manipulate Rackspace Cloud Files Containers
+  - Manipulate Rackspace Cloud Files Containers.
+  - This module relies on the C(pyrax) package which is deprecated in favour of using Openstack API.
+  - Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0.
 options:
   clear_meta:
     description:

plugins/modules/rax_files_objects.py

@@ -14,6 +14,8 @@ module: rax_files_objects
 short_description: Upload, download, and delete objects in Rackspace Cloud Files
 description:
   - Upload, download, and delete objects in Rackspace Cloud Files.
+  - This module relies on the C(pyrax) package which is deprecated in favour of using Openstack API.
+  - Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0.
 options:
   clear_meta:
     description:

plugins/modules/rax_identity.py

@@ -13,7 +13,9 @@ DOCUMENTATION = '''
 module: rax_identity
 short_description: Load Rackspace Cloud Identity
 description:
-     - Verifies Rackspace Cloud credentials and returns identity information
+  - Verifies Rackspace Cloud credentials and returns identity information.
+  - This module relies on the C(pyrax) package which is deprecated in favour of using Openstack API.
+  - Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0.
 options:
   state:
     type: str

plugins/modules/rax_keypair.py

@@ -13,7 +13,9 @@ DOCUMENTATION = '''
 module: rax_keypair
 short_description: Create a keypair for use with Rackspace Cloud Servers
 description:
-     - Create a keypair for use with Rackspace Cloud Servers
+  - Create a keypair for use with Rackspace Cloud Servers.
+  - This module relies on the C(pyrax) package which is deprecated in favour of using Openstack API.
+  - Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0.
 options:
   name:
     type: str

plugins/modules/rax_meta.py

@@ -13,7 +13,9 @@ DOCUMENTATION = '''
 module: rax_meta
 short_description: Manipulate metadata for Rackspace Cloud Servers
 description:
-     - Manipulate metadata for Rackspace Cloud Servers
+  - Manipulate metadata for Rackspace Cloud Servers.
+  - This module relies on the C(pyrax) package which is deprecated in favour of using Openstack API.
+  - Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0.
 options:
   address:
     type: str

plugins/modules/rax_mon_alarm.py

@@ -13,12 +13,14 @@ DOCUMENTATION = '''
 module: rax_mon_alarm
 short_description: Create or delete a Rackspace Cloud Monitoring alarm
 description:
-- Create or delete a Rackspace Cloud Monitoring alarm that associates an
+  - Create or delete a Rackspace Cloud Monitoring alarm that associates an
-  existing rax_mon_entity, rax_mon_check, and rax_mon_notification_plan with
+    existing rax_mon_entity, rax_mon_check, and rax_mon_notification_plan with
-  criteria that specify what conditions will trigger which levels of
+    criteria that specify what conditions will trigger which levels of
-  notifications. Rackspace monitoring module flow | rax_mon_entity ->
+    notifications. Rackspace monitoring module flow | rax_mon_entity ->
-  rax_mon_check -> rax_mon_notification -> rax_mon_notification_plan ->
+    rax_mon_check -> rax_mon_notification -> rax_mon_notification_plan ->
-  *rax_mon_alarm*
+    *rax_mon_alarm*.
+  - This module relies on the C(pyrax) package which is deprecated in favour of using Openstack API.
+  - Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0.
 options:
   state:
     type: str

plugins/modules/rax_mon_check.py

@@ -14,12 +14,14 @@ module: rax_mon_check
 short_description: Create or delete a Rackspace Cloud Monitoring check for an
                    existing entity.
 description:
-- Create or delete a Rackspace Cloud Monitoring check associated with an
+  - Create or delete a Rackspace Cloud Monitoring check associated with an
-  existing rax_mon_entity. A check is a specific test or measurement that is
+    existing rax_mon_entity. A check is a specific test or measurement that is
-  performed, possibly from different monitoring zones, on the systems you
+    performed, possibly from different monitoring zones, on the systems you
-  monitor. Rackspace monitoring module flow | rax_mon_entity ->
+    monitor. Rackspace monitoring module flow | rax_mon_entity ->
-  *rax_mon_check* -> rax_mon_notification -> rax_mon_notification_plan ->
+    *rax_mon_check* -> rax_mon_notification -> rax_mon_notification_plan ->
-  rax_mon_alarm
+    rax_mon_alarm
+  - This module relies on the C(pyrax) package which is deprecated in favour of using Openstack API.
+  - Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0.
 options:
   state:
     type: str

plugins/modules/rax_mon_entity.py

@@ -13,11 +13,13 @@ DOCUMENTATION = '''
 module: rax_mon_entity
 short_description: Create or delete a Rackspace Cloud Monitoring entity
 description:
-- Create or delete a Rackspace Cloud Monitoring entity, which represents a device
+  - Create or delete a Rackspace Cloud Monitoring entity, which represents a device
-  to monitor. Entities associate checks and alarms with a target system and
+    to monitor. Entities associate checks and alarms with a target system and
-  provide a convenient, centralized place to store IP addresses. Rackspace
+    provide a convenient, centralized place to store IP addresses. Rackspace
-  monitoring module flow | *rax_mon_entity* -> rax_mon_check ->
+    monitoring module flow | *rax_mon_entity* -> rax_mon_check ->
-  rax_mon_notification -> rax_mon_notification_plan -> rax_mon_alarm
+    rax_mon_notification -> rax_mon_notification_plan -> rax_mon_alarm.
+  - This module relies on the C(pyrax) package which is deprecated in favour of using Openstack API.
+  - Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0.
 options:
   label:
     type: str

plugins/modules/rax_mon_notification_plan.py

@@ -14,10 +14,12 @@ module: rax_mon_notification_plan
 short_description: Create or delete a Rackspace Cloud Monitoring notification
                    plan.
 description:
-- Create or delete a Rackspace Cloud Monitoring notification plan by
+  - Create or delete a Rackspace Cloud Monitoring notification plan by
-  associating existing rax_mon_notifications with severity levels. Rackspace
+    associating existing rax_mon_notifications with severity levels. Rackspace
-  monitoring module flow | rax_mon_entity -> rax_mon_check ->
+    monitoring module flow | rax_mon_entity -> rax_mon_check ->
-  rax_mon_notification -> *rax_mon_notification_plan* -> rax_mon_alarm
+    rax_mon_notification -> *rax_mon_notification_plan* -> rax_mon_alarm.
+  - This module relies on the C(pyrax) package which is deprecated in favour of using Openstack API.
+  - Unless maintainers step up to work on the module, it will be marked as deprecated in community.general 7.0.0 and removed in version 9.0.0.
 options:
   state:
     type: str

plugins/modules/redhat_subscription.py

@@ -70,6 +70,11 @@ options:
         description:
             - Specify an HTTP proxy hostname.
         type: str
+    server_proxy_scheme:
+        description:
+            - Specify an HTTP proxy scheme, for example C(http) or C(https).
+        type: str
+        version_added: 6.2.0
     server_proxy_port:
         description:
             - Specify an HTTP proxy port.
@@ -806,6 +811,7 @@ def main():
             'consumer_id': {},
             'force_register': {'default': False, 'type': 'bool'},
             'server_proxy_hostname': {},
+            'server_proxy_scheme': {},
             'server_proxy_port': {},
             'server_proxy_user': {},
             'server_proxy_password': {'no_log': True},

plugins/modules/ssh_config.py

@@ -169,6 +169,7 @@ except ImportError:
 
 from ansible.module_utils.basic import AnsibleModule, missing_required_lib
 from ansible.module_utils.common.text.converters import to_native
+from ansible_collections.community.general.plugins.module_utils.ssh import determine_config_file
 
 
 class SSHConfig():
@@ -188,10 +189,7 @@ class SSHConfig():
         self.config.load()
 
     def check_ssh_config_path(self):
-        if self.user:
+        self.config_file = determine_config_file(self.user, self.config_file)
-            self.config_file = os.path.join(os.path.expanduser('~%s' % self.user), '.ssh', 'config')
-        elif self.config_file is None:
-            self.config_file = '/etc/ssh/ssh_config'
 
         # See if the identity file exists or not, relative to the config file
         if os.path.exists(self.config_file) and self.identity_file is not None:

plugins/modules/sudoers.py

@@ -43,6 +43,12 @@ options:
       - Whether a password will be required to run the sudo'd command.
     default: true
     type: bool
+  host:
+    description:
+      - Specify the host the rule is for.
+    default: ALL
+    type: str
+    version_added: 6.2.0
   runas:
     description:
       - Specify the target user the command(s) will run as.
@@ -95,10 +101,11 @@ EXAMPLES = '''
 
 - name: >-
     Allow the monitoring group to run sudo /usr/local/bin/gather-app-metrics
-    without requiring a password
+    without requiring a password on the host called webserver
   community.general.sudoers:
     name: monitor-app
     group: monitoring
+    host: webserver
     commands: /usr/local/bin/gather-app-metrics
 
 - name: >-
@@ -136,6 +143,7 @@ class Sudoers(object):
         self.group = module.params['group']
         self.state = module.params['state']
         self.nopassword = module.params['nopassword']
+        self.host = module.params['host']
         self.runas = module.params['runas']
         self.sudoers_path = module.params['sudoers_path']
         self.file = os.path.join(self.sudoers_path, self.name)
@@ -178,7 +186,13 @@ class Sudoers(object):
         commands_str = ', '.join(self.commands)
         nopasswd_str = 'NOPASSWD:' if self.nopassword else ''
         runas_str = '({runas})'.format(runas=self.runas) if self.runas is not None else ''
-        return "{owner} ALL={runas}{nopasswd} {commands}\n".format(owner=owner, runas=runas_str, nopasswd=nopasswd_str, commands=commands_str)
+        return "{owner} {host}={runas}{nopasswd} {commands}\n".format(
+            owner=owner,
+            host=self.host,
+            runas=runas_str,
+            nopasswd=nopasswd_str,
+            commands=commands_str
+        )
 
     def validate(self):
         if self.validation == 'absent':
@@ -225,6 +239,10 @@ def main():
             'type': 'bool',
             'default': True,
         },
+        'host': {
+            'type': 'str',
+            'default': 'ALL',
+        },
         'runas': {
             'type': 'str',
             'default': None,

tests/integration/targets/ansible_galaxy_install/tasks/main.yml

@@ -10,7 +10,7 @@
     name: netbox.netbox
   register: install_c0
 
-- name: Assert collection was installed
+- name: Assert collection netbox.netbox was installed
   assert:
     that:
     - install_c0 is changed
@@ -34,7 +34,7 @@
     name: ansistrano.deploy
   register: install_r0
 
-- name: Assert collection was installed
+- name: Assert collection ansistrano.deploy was installed
   assert:
     that:
     - install_r0 is changed
@@ -52,7 +52,7 @@
     - install_r1 is not changed
 
 ###################################################
-- name:
+- name: Set requirements file path
   set_fact:
     reqs_file: '{{ remote_tmp_dir }}/reqs.yaml'
 

tests/integration/targets/filesize/aliases

@@ -3,3 +3,4 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 azp/posix/1
+azp/posix/vm

tests/integration/targets/filesystem/aliases

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 azp/posix/1
+azp/posix/vm
 destructive
 skip/aix
 skip/osx

tests/integration/targets/filesystem/tasks/create_device.yml

@@ -14,10 +14,14 @@
   block:
     - when: fstype == 'lvm'
       block:
+        - name: 'Show next free loop device'
+          ansible.builtin.command:
+            cmd: 'losetup -f'
+          register: loop_device_cmd
+
         - name: 'Create a loop device for LVM'
           ansible.builtin.command:
-            cmd: 'losetup --show -f {{ dev }}'
+            cmd: 'losetup -f {{ dev }}'
-          register: loop_device_cmd
 
         - name: 'Switch to loop device target for further tasks'
           ansible.builtin.set_fact:

tests/integration/targets/iptables_state/aliases

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 azp/posix/1
+azp/posix/vm
 destructive
 skip/docker             # kernel modules not loadable
 skip/freebsd            # no iptables/netfilter (Linux specific)

tests/integration/targets/iptables_state/tasks/tests/01-tables.yml

@@ -167,13 +167,12 @@
 
 
 
-- name: "get security, raw and mangle tables states"
+- name: "get raw and mangle tables states"
   iptables_state:
     path: "{{ iptables_saved }}"
     state: saved
     table: "{{ item }}"
   loop:
-    - security
     - raw
     - mangle
   changed_when: false
@@ -198,8 +197,6 @@
       - "'*nat' in iptables_state.saved"
       - "'raw' in iptables_state.tables"
       - "'*raw' in iptables_state.saved"
-      - "'security' in iptables_state.tables"
-      - "'*security' in iptables_state.saved"
     quiet: yes
 
 
@@ -233,17 +230,14 @@
       - "'*mangle' in iptables_state.initial_state"
       - "'*nat' in iptables_state.initial_state"
       - "'*raw' in iptables_state.initial_state"
-      - "'*security' in iptables_state.initial_state"
       - "'filter' in iptables_state.tables"
       - "'mangle' not in iptables_state.tables"
       - "'nat' not in iptables_state.tables"
       - "'raw' not in iptables_state.tables"
-      - "'security' not in iptables_state.tables"
       - "'*filter' in iptables_state.restored"
       - "'*mangle' not in iptables_state.restored"
       - "'*nat' not in iptables_state.restored"
       - "'*raw' not in iptables_state.restored"
-      - "'*security' not in iptables_state.restored"
       - iptables_state is not changed
     quiet: yes
 
@@ -264,17 +258,14 @@
       - "'*mangle' in iptables_state.initial_state"
       - "'*nat' in iptables_state.initial_state"
       - "'*raw' in iptables_state.initial_state"
-      - "'*security' in iptables_state.initial_state"
       - "'filter' in iptables_state.tables"
       - "'mangle' in iptables_state.tables"
       - "'nat' in iptables_state.tables"
       - "'raw' in iptables_state.tables"
-      - "'security' in iptables_state.tables"
       - "'*filter' in iptables_state.restored"
       - "'*mangle' in iptables_state.restored"
       - "'*nat' in iptables_state.restored"
       - "'*raw' in iptables_state.restored"
-      - "'*security' in iptables_state.restored"
       - iptables_state is not changed
     quiet: yes
 

tests/integration/targets/lvg/aliases

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 azp/posix/1
+azp/posix/vm
 destructive
 needs/privileged
 skip/aix

tests/integration/targets/lvg/tasks/setup.yml

@@ -7,12 +7,21 @@
   command: "dd if=/dev/zero of={{ remote_tmp_dir }}/img{{ item }} bs=1M count=10"
   with_sequence: 'count=2'
 
+- name: "Show next free loop device"
+  command: "losetup -f"
+  register: loop_device1
+
 - name: "Create loop device for file"
-  command: "losetup --show -f {{ remote_tmp_dir }}/img{{ item }}"
+  command: "losetup -f {{ remote_tmp_dir }}/img1"
-  with_sequence: 'count=2'
+
-  register: loop_devices
+- name: "Show next free loop device"
+  command: "losetup -f"
+  register: loop_device2
+
+- name: "Create loop device for file"
+  command: "losetup -f {{ remote_tmp_dir }}/img2"
 
 - name: "Affect name on disk to work on"
   set_fact:
-    loop_device1: "{{ loop_devices.results[0] }}"
+    loop_device1: "{{ loop_device1.stdout }}"
-    loop_device2: "{{ loop_devices.results[1] }}"
+    loop_device2: "{{ loop_device2.stdout }}"

tests/integration/targets/lvg/tasks/teardown.yml

@@ -8,15 +8,16 @@
     vg: testvg
     state: absent
 
-- name: Detach loop device
+- name: Detach loop devices
-  command: "losetup -d {{ item.stdout }}"
+  command: "losetup -d {{ item }}"
-  loop: "{{ loop_devices.results|default([]) }}"
+  loop:
+    - "{{ loop_device1 | default('') }}"
+    - "{{ loop_device2 | default('') }}"
   when:
-    - item.stdout is defined
+    - item != ''
-    - item.stdout is match("/dev/.*")
 
 - name: Remove device files
   file:
     path: "{{ remote_tmp_dir }}/img{{ item }}"
     state: absent
-  with_sequence: 'count={{ loop_devices.results|length }}'
+  with_sequence: 'count=2'

tests/integration/targets/lvg/tasks/test_grow_reduce.yml

@@ -6,7 +6,7 @@
 - name: "Create volume group on first disk"
   lvg:
     vg: testvg
-    pvs: "{{ loop_device1.stdout }}"
+    pvs: "{{ loop_device1 }}"
 
 - name: "get lvm facts"
   setup:
@@ -16,14 +16,14 @@
 - name: "Assert the testvg span only on first disk"
   assert:
     that:
-      - ansible_lvm.pvs[loop_device1.stdout].vg == "testvg"
+      - ansible_lvm.pvs[loop_device1].vg == "testvg"
-      - 'loop_device2.stdout not in ansible_lvm.pvs or
+      - 'loop_device2 not in ansible_lvm.pvs or
-         ansible_lvm.pvs[loop_device2.stdout].vg == ""'
+         ansible_lvm.pvs[loop_device2].vg == ""'
 
 - name: "Extend to second disk AND reduce from the first disk"
   lvg:
     vg: testvg
-    pvs: "{{ loop_device2.stdout }}"
+    pvs: "{{ loop_device2 }}"
 
 - name: "get lvm facts"
   setup:
@@ -33,6 +33,6 @@
 - name: "Assert the testvg span only on first disk"
   assert:
     that:
-      - 'loop_device1.stdout not in ansible_lvm.pvs or
+      - 'loop_device1 not in ansible_lvm.pvs or
-         ansible_lvm.pvs[loop_device1.stdout].vg == ""'
+         ansible_lvm.pvs[loop_device1].vg == ""'
-      - ansible_lvm.pvs[loop_device2.stdout].vg == "testvg"
+      - ansible_lvm.pvs[loop_device2].vg == "testvg"

tests/integration/targets/lvg/tasks/test_indempotency.yml

@@ -6,12 +6,12 @@
 - name: Create volume group on disk device
   lvg:
     vg: testvg
-    pvs: "{{ loop_device1.stdout }}"
+    pvs: "{{ loop_device1 }}"
 
 - name: Create the volume group again to verify idempotence
   lvg:
     vg: testvg
-    pvs: "{{ loop_device1.stdout }}"
+    pvs: "{{ loop_device1 }}"
   register: repeat_vg_create
 
 - name: Do all assertions to verify expected results

tests/integration/targets/lvg/tasks/test_pvresize.yml

@@ -6,7 +6,7 @@
 - name: "Create volume group on first disk"
   lvg:
     vg: testvg
-    pvs: "{{ loop_device1.stdout }}"
+    pvs: "{{ loop_device1 }}"
 
 - name: Gets current vg size
   shell: vgs -v testvg -o pv_size --noheading --units b | xargs
@@ -21,12 +21,12 @@
   command: "dd if=/dev/zero bs=8MiB count=1 of={{ remote_tmp_dir }}/img1 conv=notrunc oflag=append"
 
 - name: "Reread size of file associated with loop_device1"
-  command: "losetup -c {{ loop_device1.stdout }}"
+  command: "losetup -c {{ loop_device1 }}"
 
 - name: "Reruns lvg with pvresize:no"
   lvg:
    vg: testvg
-   pvs: "{{ loop_device1.stdout }}"
+   pvs: "{{ loop_device1 }}"
    pvresize: no
   register: cmd_result
  
@@ -46,7 +46,7 @@
 - name: "Reruns lvg with pvresize:yes and check_mode:yes"
   lvg:
    vg: testvg
-   pvs: "{{ loop_device1.stdout }}"
+   pvs: "{{ loop_device1 }}"
    pvresize: yes
   check_mode: yes
   register: cmd_result
@@ -68,7 +68,7 @@
 - name: "Reruns lvg with pvresize:yes"
   lvg:
    vg: testvg
-   pvs: "{{ loop_device1.stdout }}"
+   pvs: "{{ loop_device1 }}"
    pvresize: yes
 
 - name: Gets current vg size

tests/integration/targets/pipx_info/tasks/main.yml

@@ -56,7 +56,8 @@
       - info_all_deps.application|length == 1
       - info_all_deps.application[0].name == "tox"
       - "'version' in info_all_deps.application[0]"
-      - info_all_deps.application[0].dependencies == ["virtualenv"]
+      - info_all_deps.application[0].dependencies == ["chardet", "virtualenv"]
+        or info_all_deps.application[0].dependencies == ["virtualenv"]
       - "'injected' not in info_all.application[0]"
 
       - info_tox.application == info_all_deps.application

tests/integration/targets/snap/aliases

@@ -3,8 +3,12 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 azp/posix/1
+azp/posix/vm
 skip/aix
+skip/alpine
+skip/fedora
 skip/freebsd
 skip/osx
 skip/macos
 skip/docker
+skip/ubuntu  # FIXME!

tests/integration/targets/snap_alias/aliases

@@ -3,8 +3,12 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 azp/posix/1
+azp/posix/vm
 skip/aix
+skip/alpine
+skip/fedora
 skip/freebsd
 skip/osx
 skip/macos
 skip/docker
+skip/ubuntu  # FIXME!

tests/integration/targets/sudoers/tasks/main.yml

@@ -131,6 +131,19 @@
     src: "{{ sudoers_path }}/my-sudo-rule-6"
   register: rule_6_contents
 
+- name: Create rule to allow user to sudo just on host-1
+  community.general.sudoers:
+    name: my-sudo-rule-7
+    state: present
+    user: alice
+    host: host-1
+    commands: /usr/local/bin/command
+  register: rule_7
+
+- name: Grab contents of my-sudo-rule-7
+  ansible.builtin.slurp:
+    src: "{{ sudoers_path }}/my-sudo-rule-7"
+  register: rule_7_contents
 
 - name: Revoke rule 1
   community.general.sudoers:
@@ -229,6 +242,7 @@
       - "rule_4_contents['content'] | b64decode == '%students ALL=NOPASSWD: /usr/local/bin/command\n'"
       - "rule_5_contents['content'] | b64decode == 'alice ALL=NOPASSWD: /usr/local/bin/command\n'"
       - "rule_6_contents['content'] | b64decode == 'alice ALL=(bob)NOPASSWD: /usr/local/bin/command\n'"
+      - "rule_7_contents['content'] | b64decode == 'alice host-1=NOPASSWD: /usr/local/bin/command\n'"
 
 - name: Check revocation stat
   ansible.builtin.assert:

tests/integration/targets/ufw/aliases

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 azp/posix/2
+azp/posix/vm
 skip/aix
 skip/osx
 skip/macos

tests/integration/targets/xattr/aliases

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 azp/posix/2
+azp/posix/vm
 skip/aix
 skip/docker
 skip/freebsd

tests/integration/targets/xfs_quota/aliases

@@ -3,9 +3,11 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 azp/posix/1
+azp/posix/vm
 needs/privileged
 needs/root
 skip/aix
+skip/alpine  # FIXME
 skip/osx
 skip/macos
 skip/freebsd

tests/sanity/ignore-2.11.txt

@@ -10,7 +10,7 @@ plugins/modules/consul_session.py validate-modules:parameter-state-invalid-choic
 plugins/modules/gconftool2.py validate-modules:parameter-state-invalid-choice         # state=get - removed in 8.0.0
 plugins/modules/iptables_state.py validate-modules:undocumented-parameter
 plugins/modules/lxc_container.py validate-modules:use-run-command-not-popen
-plugins/modules/manageiq_policies.py validate-modules:parameter-state-invalid-choice
+plugins/modules/manageiq_policies.py validate-modules:parameter-state-invalid-choice  # state=list - removed in 8.0.0
 plugins/modules/manageiq_provider.py validate-modules:doc-choices-do-not-match-spec   # missing docs on suboptions
 plugins/modules/manageiq_provider.py validate-modules:doc-missing-type                # missing docs on suboptions
 plugins/modules/manageiq_provider.py validate-modules:parameter-type-not-in-doc       # missing docs on suboptions
@@ -18,13 +18,11 @@ plugins/modules/manageiq_provider.py validate-modules:undocumented-parameter
 plugins/modules/manageiq_tags.py validate-modules:parameter-state-invalid-choice
 plugins/modules/osx_defaults.py validate-modules:parameter-state-invalid-choice
 plugins/modules/parted.py validate-modules:parameter-state-invalid-choice
-plugins/modules/puppet.py use-argspec-type-path
+plugins/modules/puppet.py validate-modules:parameter-invalid                          # invalid alias - removed in 7.0.0
-plugins/modules/puppet.py validate-modules:parameter-invalid  # invalid alias - removed in 7.0.0
 plugins/modules/rax_files_objects.py use-argspec-type-path
 plugins/modules/rax_files.py validate-modules:parameter-state-invalid-choice
 plugins/modules/rax.py use-argspec-type-path # fix needed
 plugins/modules/rhevm.py validate-modules:parameter-state-invalid-choice
-plugins/modules/ssh_config.py use-argspec-type-path # Required since module uses other methods to specify path
 plugins/modules/xfconf.py validate-modules:return-syntax-error
 plugins/modules/yarn.py use-argspec-type-path
 tests/integration/targets/django_manage/files/base_test/simple_project/p1/manage.py compile-2.6   # django generated code

tests/sanity/ignore-2.12.txt

@@ -5,7 +5,7 @@ plugins/modules/consul_session.py validate-modules:parameter-state-invalid-choic
 plugins/modules/gconftool2.py validate-modules:parameter-state-invalid-choice         # state=get - removed in 8.0.0
 plugins/modules/iptables_state.py validate-modules:undocumented-parameter
 plugins/modules/lxc_container.py validate-modules:use-run-command-not-popen
-plugins/modules/manageiq_policies.py validate-modules:parameter-state-invalid-choice
+plugins/modules/manageiq_policies.py validate-modules:parameter-state-invalid-choice  # state=list - removed in 8.0.0
 plugins/modules/manageiq_provider.py validate-modules:doc-choices-do-not-match-spec   # missing docs on suboptions
 plugins/modules/manageiq_provider.py validate-modules:doc-missing-type                # missing docs on suboptions
 plugins/modules/manageiq_provider.py validate-modules:parameter-type-not-in-doc       # missing docs on suboptions
@@ -13,12 +13,10 @@ plugins/modules/manageiq_provider.py validate-modules:undocumented-parameter
 plugins/modules/manageiq_tags.py validate-modules:parameter-state-invalid-choice
 plugins/modules/osx_defaults.py validate-modules:parameter-state-invalid-choice
 plugins/modules/parted.py validate-modules:parameter-state-invalid-choice
-plugins/modules/puppet.py use-argspec-type-path
+plugins/modules/puppet.py validate-modules:parameter-invalid                          # invalid alias - removed in 7.0.0
-plugins/modules/puppet.py validate-modules:parameter-invalid  # invalid alias - removed in 7.0.0
 plugins/modules/rax_files_objects.py use-argspec-type-path
 plugins/modules/rax_files.py validate-modules:parameter-state-invalid-choice
 plugins/modules/rax.py use-argspec-type-path # fix needed
 plugins/modules/rhevm.py validate-modules:parameter-state-invalid-choice
-plugins/modules/ssh_config.py use-argspec-type-path # Required since module uses other methods to specify path
 plugins/modules/xfconf.py validate-modules:return-syntax-error
 plugins/modules/yarn.py use-argspec-type-path

tests/sanity/ignore-2.13.txt

@@ -5,7 +5,7 @@ plugins/modules/consul_session.py validate-modules:parameter-state-invalid-choic
 plugins/modules/gconftool2.py validate-modules:parameter-state-invalid-choice         # state=get - removed in 8.0.0
 plugins/modules/iptables_state.py validate-modules:undocumented-parameter
 plugins/modules/lxc_container.py validate-modules:use-run-command-not-popen
-plugins/modules/manageiq_policies.py validate-modules:parameter-state-invalid-choice
+plugins/modules/manageiq_policies.py validate-modules:parameter-state-invalid-choice  # state=list - removed in 8.0.0
 plugins/modules/manageiq_provider.py validate-modules:doc-choices-do-not-match-spec   # missing docs on suboptions
 plugins/modules/manageiq_provider.py validate-modules:doc-missing-type                # missing docs on suboptions
 plugins/modules/manageiq_provider.py validate-modules:parameter-type-not-in-doc       # missing docs on suboptions
@@ -13,12 +13,10 @@ plugins/modules/manageiq_provider.py validate-modules:undocumented-parameter
 plugins/modules/manageiq_tags.py validate-modules:parameter-state-invalid-choice
 plugins/modules/osx_defaults.py validate-modules:parameter-state-invalid-choice
 plugins/modules/parted.py validate-modules:parameter-state-invalid-choice
-plugins/modules/puppet.py use-argspec-type-path
+plugins/modules/puppet.py validate-modules:parameter-invalid                          # invalid alias - removed in 7.0.0
-plugins/modules/puppet.py validate-modules:parameter-invalid  # invalid alias - removed in 7.0.0
 plugins/modules/rax_files_objects.py use-argspec-type-path
 plugins/modules/rax_files.py validate-modules:parameter-state-invalid-choice
 plugins/modules/rax.py use-argspec-type-path # fix needed
 plugins/modules/rhevm.py validate-modules:parameter-state-invalid-choice
-plugins/modules/ssh_config.py use-argspec-type-path # Required since module uses other methods to specify path
 plugins/modules/xfconf.py validate-modules:return-syntax-error
 plugins/modules/yarn.py use-argspec-type-path

tests/sanity/ignore-2.14.txt

@@ -6,7 +6,7 @@ plugins/modules/gconftool2.py validate-modules:parameter-state-invalid-choice
 plugins/modules/homectl.py import-3.11  # Uses deprecated stdlib library 'crypt'
 plugins/modules/iptables_state.py validate-modules:undocumented-parameter
 plugins/modules/lxc_container.py validate-modules:use-run-command-not-popen
-plugins/modules/manageiq_policies.py validate-modules:parameter-state-invalid-choice
+plugins/modules/manageiq_policies.py validate-modules:parameter-state-invalid-choice  # state=list - removed in 8.0.0
 plugins/modules/manageiq_provider.py validate-modules:doc-choices-do-not-match-spec   # missing docs on suboptions
 plugins/modules/manageiq_provider.py validate-modules:doc-missing-type                # missing docs on suboptions
 plugins/modules/manageiq_provider.py validate-modules:parameter-type-not-in-doc       # missing docs on suboptions
@@ -14,13 +14,11 @@ plugins/modules/manageiq_provider.py validate-modules:undocumented-parameter
 plugins/modules/manageiq_tags.py validate-modules:parameter-state-invalid-choice
 plugins/modules/osx_defaults.py validate-modules:parameter-state-invalid-choice
 plugins/modules/parted.py validate-modules:parameter-state-invalid-choice
-plugins/modules/puppet.py use-argspec-type-path
+plugins/modules/puppet.py validate-modules:parameter-invalid                          # invalid alias - removed in 7.0.0
-plugins/modules/puppet.py validate-modules:parameter-invalid  # invalid alias - removed in 7.0.0
 plugins/modules/rax_files_objects.py use-argspec-type-path
 plugins/modules/rax_files.py validate-modules:parameter-state-invalid-choice
 plugins/modules/rax.py use-argspec-type-path # fix needed
 plugins/modules/rhevm.py validate-modules:parameter-state-invalid-choice
-plugins/modules/ssh_config.py use-argspec-type-path # Required since module uses other methods to specify path
 plugins/modules/udm_user.py import-3.11  # Uses deprecated stdlib library 'crypt'
 plugins/modules/xfconf.py validate-modules:return-syntax-error
 plugins/modules/yarn.py use-argspec-type-path

tests/sanity/ignore-2.15.txt

@@ -6,7 +6,7 @@ plugins/modules/gconftool2.py validate-modules:parameter-state-invalid-choice
 plugins/modules/homectl.py import-3.11  # Uses deprecated stdlib library 'crypt'
 plugins/modules/iptables_state.py validate-modules:undocumented-parameter
 plugins/modules/lxc_container.py validate-modules:use-run-command-not-popen
-plugins/modules/manageiq_policies.py validate-modules:parameter-state-invalid-choice
+plugins/modules/manageiq_policies.py validate-modules:parameter-state-invalid-choice  # state=list - removed in 8.0.0
 plugins/modules/manageiq_provider.py validate-modules:doc-choices-do-not-match-spec   # missing docs on suboptions
 plugins/modules/manageiq_provider.py validate-modules:doc-missing-type                # missing docs on suboptions
 plugins/modules/manageiq_provider.py validate-modules:parameter-type-not-in-doc       # missing docs on suboptions
@@ -14,13 +14,11 @@ plugins/modules/manageiq_provider.py validate-modules:undocumented-parameter
 plugins/modules/manageiq_tags.py validate-modules:parameter-state-invalid-choice
 plugins/modules/osx_defaults.py validate-modules:parameter-state-invalid-choice
 plugins/modules/parted.py validate-modules:parameter-state-invalid-choice
-plugins/modules/puppet.py use-argspec-type-path
+plugins/modules/puppet.py validate-modules:parameter-invalid                          # invalid alias - removed in 7.0.0
-plugins/modules/puppet.py validate-modules:parameter-invalid  # invalid alias - removed in 7.0.0
 plugins/modules/rax_files_objects.py use-argspec-type-path
 plugins/modules/rax_files.py validate-modules:parameter-state-invalid-choice
 plugins/modules/rax.py use-argspec-type-path # fix needed
 plugins/modules/rhevm.py validate-modules:parameter-state-invalid-choice
-plugins/modules/ssh_config.py use-argspec-type-path # Required since module uses other methods to specify path
 plugins/modules/udm_user.py import-3.11  # Uses deprecated stdlib library 'crypt'
 plugins/modules/xfconf.py validate-modules:return-syntax-error
 plugins/modules/yarn.py use-argspec-type-path

tests/unit/plugins/modules/test_puppet.py

@@ -0,0 +1,145 @@
+# -*- coding: utf-8 -*-
+# Author: Alexei Znamensky (russoz@gmail.com)
+# Largely adapted from test_redhat_subscription by
+# Jiri Hnidek (jhnidek@redhat.com)
+#
+# Copyright (c) Alexei Znamensky (russoz@gmail.com)
+# Copyright (c) Jiri Hnidek (jhnidek@redhat.com)
+#
+# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+import json
+
+from ansible_collections.community.general.plugins.modules import puppet
+
+import pytest
+
+TESTED_MODULE = puppet.__name__
+
+
+@pytest.fixture
+def patch_get_bin_path(mocker):
+    """
+    Function used for mocking AnsibleModule.get_bin_path
+    """
+    def mockie(self, path, *args, **kwargs):
+        return "/testbin/{0}".format(path)
+    mocker.patch("ansible.module_utils.basic.AnsibleModule.get_bin_path", mockie)
+
+
+TEST_CASES = [
+    [
+        {},
+        {
+            "id": "puppet_agent_plain",
+            "run_command.calls": [
+                (
+                    ["/testbin/puppet", "config", "print", "agent_disabled_lockfile"],
+                    {"environ_update": {"LANGUAGE": "C", "LC_ALL": "C"}, "check_rc": False},
+                    (0, "blah, anything", "",),  # output rc, out, err
+                ),
+                (
+                    [
+                        "/testbin/timeout", "-s", "9", "30m", "/testbin/puppet", "agent", "--onetime", "--no-daemonize",
+                        "--no-usecacheonfailure", "--no-splay", "--detailed-exitcodes", "--verbose", "--color", "0"
+                    ],
+                    {"environ_update": {"LANGUAGE": "C", "LC_ALL": "C"}, "check_rc": False},
+                    (0, "", "",),  # output rc, out, err
+                ),
+            ],
+            "changed": False,
+        }
+    ],
+    [
+        {
+            "certname": "potatobox"
+        },
+        {
+            "id": "puppet_agent_certname",
+            "run_command.calls": [
+                (
+                    ["/testbin/puppet", "config", "print", "agent_disabled_lockfile"],
+                    {"environ_update": {"LANGUAGE": "C", "LC_ALL": "C"}, "check_rc": False},
+                    (0, "blah, anything", "",),  # output rc, out, err
+                ),
+                (
+                    [
+                        "/testbin/timeout", "-s", "9", "30m", "/testbin/puppet", "agent", "--onetime", "--no-daemonize",
+                        "--no-usecacheonfailure", "--no-splay", "--detailed-exitcodes", "--verbose", "--color", "0", "--certname=potatobox"
+                    ],
+                    {"environ_update": {"LANGUAGE": "C", "LC_ALL": "C"}, "check_rc": False},
+                    (0, "", "",),  # output rc, out, err
+                ),
+            ],
+            "changed": False,
+        }
+    ],
+    [
+        {
+            "tags": ["a", "b", "c"]
+        },
+        {
+            "id": "puppet_agent_tags_abc",
+            "run_command.calls": [
+                (
+                    ["/testbin/puppet", "config", "print", "agent_disabled_lockfile"],
+                    {"environ_update": {"LANGUAGE": "C", "LC_ALL": "C"}, "check_rc": False},
+                    (0, "blah, anything", "",),  # output rc, out, err
+                ),
+                (
+                    [
+                        "/testbin/timeout", "-s", "9", "30m", "/testbin/puppet", "agent", "--onetime", "--no-daemonize",
+                        "--no-usecacheonfailure", "--no-splay", "--detailed-exitcodes", "--verbose", "--color", "0", "--tags", "a,b,c"
+                    ],
+                    {"environ_update": {"LANGUAGE": "C", "LC_ALL": "C"}, "check_rc": False},
+                    (0, "", "",),  # output rc, out, err
+                ),
+            ],
+            "changed": False,
+        }
+    ],
+]
+TEST_CASES_IDS = [item[1]["id"] for item in TEST_CASES]
+
+
+@pytest.mark.parametrize("patch_ansible_module, testcase",
+                         TEST_CASES,
+                         ids=TEST_CASES_IDS,
+                         indirect=["patch_ansible_module"])
+@pytest.mark.usefixtures("patch_ansible_module")
+def test_puppet(mocker, capfd, patch_get_bin_path, testcase):
+    """
+    Run unit tests for test cases listen in TEST_CASES
+    """
+
+    # Mock function used for running commands first
+    call_results = [item[2] for item in testcase["run_command.calls"]]
+    mock_run_command = mocker.patch(
+        "ansible.module_utils.basic.AnsibleModule.run_command",
+        side_effect=call_results)
+
+    # Try to run test case
+    with pytest.raises(SystemExit):
+        puppet.main()
+
+    out, err = capfd.readouterr()
+    results = json.loads(out)
+    print("results =\n%s" % results)
+
+    assert mock_run_command.call_count == len(testcase["run_command.calls"])
+    if mock_run_command.call_count:
+        call_args_list = [(item[0][0], item[1]) for item in mock_run_command.call_args_list]
+        expected_call_args_list = [(item[0], item[1]) for item in testcase["run_command.calls"]]
+        print("call args list =\n%s" % call_args_list)
+        print("expected args list =\n%s" % expected_call_args_list)
+        assert call_args_list == expected_call_args_list
+
+    assert results.get("changed", False) == testcase["changed"]
+    if "failed" in testcase:
+        assert results.get("failed", False) == testcase["failed"]
+    if "msg" in testcase:
+        assert results.get("msg", "") == testcase["msg"]

tests/unit/plugins/modules/test_redhat_subscription.py

@@ -308,6 +308,7 @@ TEST_CASES = [
             'org_id': 'admin',
             'force_register': 'true',
             'server_proxy_hostname': 'proxy.company.com',
+            'server_proxy_scheme': 'https',
             'server_proxy_port': '12345',
             'server_proxy_user': 'proxy_user',
             'server_proxy_password': 'secret_proxy_password'
@@ -327,6 +328,7 @@ TEST_CASES = [
                         '--server.proxy_hostname=proxy.company.com',
                         '--server.proxy_password=secret_proxy_password',
                         '--server.proxy_port=12345',
+                        '--server.proxy_scheme=https',
                         '--server.proxy_user=proxy_user'
                     ],
                     {'check_rc': True},

tests/utils/shippable/alpine.sh

@@ -0,0 +1 @@
+remote.sh

tests/utils/shippable/fedora.sh

@@ -0,0 +1 @@
+remote.sh

tests/utils/shippable/ubuntu.sh

@@ -0,0 +1 @@
+remote.sh