Merge pull request #46 from RedHatSatellite/rel330

Release 3.3.0

.ansible-lint

@@ -0,0 +1,3 @@
+---
+warn_list:
+  - fqcn-builtins

.github/workflows/codeql-analysis.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1

.github/workflows/docs.yml

@@ -12,14 +12,14 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'RedHatSatellite/satellite-ansible-collection'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: configure git
         run: |
           git config user.name "${GITHUB_ACTOR}"
           git config user.email "${GITHUB_ACTOR}@bots.github.com"
           git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: "3.8"
       - name: Install dependencies

.github/workflows/main.yml

@@ -20,6 +20,7 @@ jobs:
           - stable-2.10
           - stable-2.11
           - stable-2.12
+          - stable-2.13
           - devel
         include:
           - python: "2.7"
@@ -35,13 +36,13 @@ jobs:
           - python: "3.10"
             ansible: "devel"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python }}
       - name: Restore pip cache
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements*.txt') }}
@@ -50,7 +51,7 @@ jobs:
       - name: Install libyaml-dev for PyYAML
         run: sudo apt-get install -y libyaml-dev
       - name: Install Ansible
-        run: pip install --upgrade git+https://github.com/ansible/ansible.git@${{ matrix.ansible }}
+        run: pip install --upgrade https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz
       - name: Install dependencies
         run: make test-setup
       - name: prepare a redhat-uep.pem, even if we run on Ubuntu
@@ -71,13 +72,13 @@ jobs:
   checkmode:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: "3.8"
       - name: Restore pip cache
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements*.txt') }}
@@ -95,13 +96,13 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: "3.8"
       - name: Restore pip cache
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements*.txt') }}
@@ -120,13 +121,13 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: "3.8"
       - name: Restore pip cache
-        uses: actions/cache@v2.1.7
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements*.txt') }}

.github/workflows/release.yml

@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'RedHatSatellite/satellite-ansible-collection'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: "3.8"
       - name: Install Ansible

.mailmap

@@ -24,3 +24,4 @@ Quirin Pamp <[email protected]> <[email protected]>
 Quirin Pamp <[email protected]>
 Kenny Tordeurs <[email protected]> <[email protected]>
 Lukáš Zapletal <[email protected]>
+Leos Stejskal <[email protected]> <[email protected]>

CHANGELOG.rst

@@ -6,6 +6,28 @@ redhat.satellite Release Notes
 
 This changelog describes changes after version 0.8.1.
 
+v3.3.0
+======
+
+Minor Changes
+-------------
+
+- content_upload - add support for OSTree content uploads (https://github.com/theforeman/foreman-ansible-modules/issues/628, https://projects.theforeman.org/issues/33299)
+- os_default_template, provisioning_template - add ``host_init_config`` to list of possible template types
+
+v3.2.0
+======
+
+Minor Changes
+-------------
+
+- new ``auth_sources_ldap`` role to manage LDAP authentication sources
+
+Bugfixes
+--------
+
+- content_upload - clarify that ``src`` refers to a remote file (https://bugzilla.redhat.com/show_bug.cgi?id=2055416)
+
 v3.1.0
 ======
 

Makefile

@@ -65,7 +65,7 @@ test-other:
 	$(PYTEST) -k 'not test_crud.py'
 
 livetest: $(MANIFEST) | tests/test_playbooks/vars/server.yml
-	pytest -vv 'tests/test_crud.py::test_crud' --vcrmode live
+	pytest -vv 'tests/test_crud.py::test_crud' --vcrmode live $(FLAGS)
 
 test_%: FORCE $(MANIFEST) | tests/test_playbooks/vars/server.yml
 	pytest -vv 'tests/test_crud.py::test_crud[$*]' 'tests/test_crud.py::test_check_mode[$*]' $(FLAGS)

bindep.txt

@@ -1,2 +1,3 @@
 python3-rpm [(platform:redhat platform:base-py3)]
 rpm-python [(platform:redhat platform:base-py2)]
+python38-requests [platform:centos-8 platform:rhel-8]

changelogs/changelog.yaml

@@ -559,3 +559,24 @@ releases:
     - explicit-http-warning.yml
     - inventory-facts-batch-size.yml
     release_date: '2022-01-14'
+  3.2.0:
+    changes:
+      bugfixes:
+      - content_upload - clarify that ``src`` refers to a remote file (https://bugzilla.redhat.com/show_bug.cgi?id=2055416)
+      minor_changes:
+      - new ``auth_sources_ldap`` role to manage LDAP authentication sources
+    fragments:
+    - add-auth-source-ldaps-role.yml
+    - bz2055416.yaml
+    release_date: '2022-03-01'
+  3.3.0:
+    changes:
+      minor_changes:
+      - content_upload - add support for OSTree content uploads (https://github.com/theforeman/foreman-ansible-modules/issues/628,
+        https://projects.theforeman.org/issues/33299)
+      - os_default_template, provisioning_template - add ``host_init_config`` to list
+        of possible template types
+    fragments:
+    - 1297-host_init_config.yml
+    - 628-ostree.yml
+    release_date: '2022-04-04'

galaxy.yml

@@ -15,19 +15,23 @@ authors:
   - "Chris Hindman <[email protected]>"
   - "Chris Snell <[email protected]>"
   - "Christoffer Reijer <[email protected]>"
+  - "Dave Thomas <[email protected]>"
   - "Deric Crago <[email protected]>"
   - "Eric D. Helms <[email protected]>"
   - "Eric L <[email protected]>"
   - "Ethan <[email protected]>"
   - "Evgeni Golov <[email protected]>"
   - "Ewoud Kohl van Wijngaarden <[email protected]>"
   - "Greg Swift <[email protected]>"
+  - "Griffin Sullivan <[email protected]>"
   - "Hideki Saito <[email protected]>"
   - "Ismael Puerto <[email protected]>"
   - "Jameer Pathan <[email protected]>"
+  - "James Jeffers <[email protected]>"
   - "James Stuart <[email protected]>"
   - "Jeffrey van Pelt <[email protected]>"
   - "Jeremy Albinet <[email protected]>"
+  - "Jesper Reenberg <[email protected]>"
   - "John Berninger <[email protected]>"
   - "Josh Swanson <[email protected]>"
   - "Kenny Tordeurs <[email protected]>"
@@ -50,6 +54,7 @@ authors:
   - "Patrick C. F. Ernzer <[email protected]>"
   - "Patrick Creech <[email protected]>"
   - "Paul Armstrong <[email protected]>"
+  - "Paul Belanger <[email protected]>"
   - "Paul Gration <[email protected]>"
   - "Peter Ondrejka <[email protected]>"
   - "Philipp <[email protected]>"
@@ -72,7 +77,7 @@ authors:
   - "metalcated <[email protected]>"
   - "russianguppie <[email protected]>"
   - "willtome <[email protected]>"
-version: "3.1.0"
+version: "3.3.0"
 license:
   - "GPL-3.0-or-later"
 tags:

plugins/callback/foreman.py

@@ -10,7 +10,7 @@
 __metaclass__ = type
 
 DOCUMENTATION = '''
-    callback: redhat.satellite.foreman
+    name: foreman
     type: notification
     short_description: Sends events to Foreman
     description:

plugins/inventory/foreman.py

@@ -11,7 +11,6 @@
 
 DOCUMENTATION = '''
     name: foreman
-    plugin_type: inventory
     short_description: Foreman inventory source
     requirements:
         - requests >= 1.1
@@ -149,6 +148,7 @@
           - A list of templates in order of precedence to compose inventory_hostname.
           - If the template results in an empty string or None value it is ignored.
         type: list
+        elements: str
         default: ['name']
 '''
 
@@ -169,7 +169,7 @@
   - name.split('.')[0]
 '''
 import json
-from distutils.version import LooseVersion
+from ansible_collections.redhat.satellite.plugins.module_utils._version import LooseVersion
 from time import sleep
 from ansible.errors import AnsibleError
 from ansible.module_utils._text import to_bytes, to_native, to_text