Merge pull request #37 from RedHatSatellite/rel300

Release 3.0.0
RedHatSatellite · Nov 29, 2021 · 780e5c4 · 780e5c4
2 parents 9509b46 + c217f37
commit 780e5c4
Show file tree

Hide file tree

Showing 101 changed files with 14,642 additions and 1,049 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: "3.7"
+          python-version: "3.8"
       - name: Install dependencies
         run: make doc-setup
       - name: Build docs

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,50 +14,26 @@ jobs:
       fail-fast: false
       matrix:
         python:
-          - "2.7"
-          - "3.6"
-          - "3.7"
           - "3.8"
-          - "3.9"
         ansible:
-          - stable-2.8
           - stable-2.9
           - stable-2.10
           - stable-2.11
+          - stable-2.12
           - devel
-        exclude:
-          - python: "2.7"
-            ansible: "stable-2.8"
-          - python: "2.7"
-            ansible: "stable-2.9"
-          - python: "2.7"
-            ansible: "stable-2.10"
+        include:
           - python: "2.7"
             ansible: "stable-2.11"
-          - python: "3.6"
-            ansible: "stable-2.8"
-          - python: "3.6"
-            ansible: "stable-2.9"
-          - python: "3.6"
-            ansible: "stable-2.10"
+          - python: "3.5"
+            ansible: "stable-2.11"
           - python: "3.6"
             ansible: "stable-2.11"
-          - python: "3.8"
-            ansible: "stable-2.8"
-          - python: "3.8"
-            ansible: "stable-2.9"
-          - python: "3.8"
-            ansible: "stable-2.10"
-          - python: "3.8"
+          - python: "3.7"
             ansible: "stable-2.11"
           - python: "3.9"
-            ansible: "stable-2.8"
-          - python: "3.9"
-            ansible: "stable-2.9"
-          - python: "3.9"
-            ansible: "stable-2.10"
-          - python: "3.9"
-            ansible: "stable-2.11"
+            ansible: "devel"
+          - python: "3.10"
+            ansible: "devel"
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python
@@ -75,18 +51,13 @@ jobs:
         run: sudo apt-get install -y libyaml-dev
       - name: Install Ansible
         run: pip install --upgrade git+https://github.com/ansible/ansible.git@${{ matrix.ansible }}
-      - name: Set Environment to use mazer
-        run: |
-          echo "COLLECTION_COMMAND=mazer" >> $GITHUB_ENV
-          pip install --upgrade mazer
-        if: matrix.ansible == 'stable-2.8'
       - name: Install dependencies
         run: make test-setup
-      - name: fake redhat-uep.pem for redhat_manifest module
-        run: sudo mkdir -p /etc/rhsm/ca/ && sudo touch /etc/rhsm/ca/redhat-uep.pem
+      - name: prepare a redhat-uep.pem, even if we run on Ubuntu
+        run: sudo mkdir -p /etc/rhsm/ca/ && sudo curl -o /etc/rhsm/ca/redhat-uep.pem https://ftp.redhat.com/redhat/convert2rhel/redhat-uep.pem
       - name: Install required collections for ansible-base (2.10+)
         run: ansible-galaxy collection install community.docker
-        if: matrix.ansible == 'devel' || matrix.ansible == 'stable-2.10' || matrix.ansible == 'stable-2.11'
+        if: matrix.ansible != 'stable-2.9'
       - name: Run crud tests
         run: make test-crud
       - name: Run other tests
@@ -95,7 +66,7 @@ jobs:
         run: make dist-test
       - name: Run sanity tests
         run: make SANITY_OPTS="--local" sanity
-        if: matrix.ansible == 'devel' || matrix.ansible == 'stable-2.10' || matrix.stable == 'stable-2.11'
+        if: matrix.ansible != 'stable-2.9'
 
   checkmode:
     runs-on: ubuntu-latest
@@ -104,7 +75,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: "3.7"
+          python-version: "3.8"
       - name: Restore pip cache
         uses: actions/[email protected]
         with:
@@ -116,6 +87,8 @@ jobs:
         run: pip install --upgrade ansible
       - name: Install dependencies
         run: make test-setup
+      - name: prepare a redhat-uep.pem, even if we run on Ubuntu
+        run: sudo mkdir -p /etc/rhsm/ca/ && sudo curl -o /etc/rhsm/ca/redhat-uep.pem https://ftp.redhat.com/redhat/convert2rhel/redhat-uep.pem
       - name: Run check_mode tests
         run: make test-check-mode
 
@@ -126,7 +99,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: "3.7"
+          python-version: "3.8"
       - name: Restore pip cache
         uses: actions/[email protected]
         with:
@@ -151,7 +124,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: "3.7"
+          python-version: "3.8"
       - name: Restore pip cache
         uses: actions/[email protected]
         with:

diff --git a/.mailmap b/.mailmap
@@ -20,3 +20,5 @@ Yifat Makias <[email protected]>
 Yifat Makias <[email protected]> <[email protected]>
 Quirin Pamp <[email protected]> <[email protected]>
 Quirin Pamp <[email protected]>
+Kenny Tordeurs <[email protected]> <[email protected]>
+Lukáš Zapletal <[email protected]>
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,6 +6,27 @@ redhat.satellite Release Notes
 
 This changelog describes changes after version 0.8.1.
 
+v3.0.0
+======
+
+Minor Changes
+-------------
+
+- Add a role `convert2rhel` to perform setup for converting systems to RHEL
+- inventory plugin - enable certificate validation by default
+- repository - add ``arch`` parameter to limit architectures of the repository (https://github.com/theforeman/foreman-ansible-modules/issues/1265)
+
+Breaking Changes / Porting Guide
+--------------------------------
+
+- Set use_reports_api default value to true for the inventory plugin
+- Support for Ansible 2.8 is removed
+
+Bugfixes
+--------
+
+- host, hostgroup - fix updating puppetclasses while also updating description (or other string-like attributes) (https://github.com/theforeman/foreman-ansible-modules/issues/1231)
+
 v2.2.0
 ======
 

diff --git a/Makefile b/Makefile
@@ -93,25 +93,13 @@ dist-test: $(MANIFEST)
 	ansible-doc $(NAMESPACE).$(NAME).organization | grep -q "Manage Organization"
 
 $(MANIFEST): $(NAMESPACE)-$(NAME)-$(VERSION).tar.gz
-ifeq ($(COLLECTION_COMMAND),mazer)
-	# No idea, why this fails. But mazer is old and deprecated so unlikely to beeing fixed...
-	# mazer install --collections-path build/collections $<
-	-mkdir build/collections build/collections/ansible_collections build/collections/ansible_collections/$(NAMESPACE) build/collections/ansible_collections/$(NAMESPACE)/$(NAME)
-	tar xf $< -C build/collections/ansible_collections/$(NAMESPACE)/$(NAME)
-else
 	ansible-galaxy collection install -p build/collections $< --force
-endif
 
 build/src/%: %
 	install -m 644 -DT $< $@
 
 $(NAMESPACE)-$(NAME)-$(VERSION).tar.gz: $(addprefix build/src/,$(DEPENDENCIES))
-ifeq ($(COLLECTION_COMMAND),mazer)
-	mazer build --collection-path=build/src
-	cp build/src/releases/$@ .
-else
 	ansible-galaxy collection build build/src --force
-endif
 
 dist: $(NAMESPACE)-$(NAME)-$(VERSION).tar.gz
 
@@ -138,7 +126,7 @@ vendor:
 	python vendor.py build/apypie-git/apypie/*.py > plugins/module_utils/_apypie.py
 
 branding:
-	sed -i 's/theforeman\.foreman/redhat.satellite/g' plugins/*/*.py tests/inventory/*.foreman.yml tests/test_module_state.py tests/test_playbooks/*.yml changelogs/config.yaml changelogs/changelog.yaml CHANGELOG.rst roles/*/README.md roles/*/*/*.yml docs/cvmanager.md tests/test_playbooks/fixtures/*.yml
+	sed -i 's/theforeman\.foreman/redhat.satellite/g' plugins/*/*.py tests/inventory/*.foreman.yml tests/test_callback.py tests/test_module_state.py tests/test_playbooks/*.yml changelogs/config.yaml changelogs/changelog.yaml CHANGELOG.rst roles/*/README.md roles/*/*/*.yml docs/cvmanager.md tests/test_playbooks/fixtures/*.yml
 	sed -i 's/foreman.example.com/satellite.example.com/g' plugins/*/*.py docs/cvmanager.md roles/*/README.md roles/*/*/*.yml
 	sed -i 's#theforeman/foreman-ansible-modules#RedHatSatellite/satellite-ansible-collection#g' .github/workflows/*.yml
 	sed -i 's/theforeman-foreman/redhat-satellite/g' .github/workflows/*.yml
@@ -147,7 +135,7 @@ branding:
 	sed -i '/FOREMAN_\w/ s/FOREMAN_/SATELLITE_/g' plugins/doc_fragments/foreman.py plugins/module_utils/foreman_helper.py Makefile
 	sed -i '/foreman_\w/ s/foreman_/satellite_/g' roles/*/README.md roles/*/*/*.yml
 	sed -i 's#theforeman.github.io/foreman-ansible-modules#redhatsatellite.github.io/satellite-ansible-collection#g' roles/*/README.md
-	sed -i '/foreman_\w.*:/ s/foreman_/satellite_/g' tests/test_playbooks/*_role.yml docs/cvmanager.md
+	sed -i '/foreman_\w.*:/ s/foreman_/satellite_/g' tests/test_playbooks/*_role.yml tests/test_playbooks/convert2rhel.yml docs/cvmanager.md
 	rm -rf tests/test_playbooks/scc_* tests/test_playbooks/tasks/scc_* tests/test_playbooks/fixtures/scc_* plugins/modules/scc_*.py tests/fixtures/apidoc/scc_*.json
 	rm -rf tests/test_playbooks/snapshot* tests/test_playbooks/tasks/snapshot* tests/test_playbooks/fixtures/snapshot* plugins/modules/snapshot.py tests/fixtures/apidoc/snapshot.json
 

diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
@@ -502,3 +502,24 @@ releases:
     - 1268-ak_param_duplicate.yml
     - repository.yml
     release_date: '2021-08-24'
+  3.0.0:
+    changes:
+      breaking_changes:
+      - Set use_reports_api default value to true for the inventory plugin
+      - Support for Ansible 2.8 is removed
+      bugfixes:
+      - host, hostgroup - fix updating puppetclasses while also updating description
+        (or other string-like attributes) (https://github.com/theforeman/foreman-ansible-modules/issues/1231)
+      minor_changes:
+      - Add a role `convert2rhel` to perform setup for converting systems to RHEL
+      - inventory plugin - enable certificate validation by default
+      - repository - add ``arch`` parameter to limit architectures of the repository
+        (https://github.com/theforeman/foreman-ansible-modules/issues/1265)
+    fragments:
+    - 1231-puppetclasses-and-description-update.yml
+    - 1265-repository-arch.yml
+    - 1291-foreman-ansible-inventory-default.yml
+    - convert2rhel.yml
+    - drop-ansible28.yml
+    - validate-inventory-certs.yml
+    release_date: '2021-11-11'
diff --git a/galaxy.yml b/galaxy.yml
@@ -30,7 +30,9 @@ authors:
   - "Jeremy Albinet <[email protected]>"
   - "John Berninger <[email protected]>"
   - "Josh Swanson <[email protected]>"
+  - "Kenny Tordeurs <[email protected]>"
   - "Kirill Shirinkin <[email protected]>"
+  - "Leos Stejskal <[email protected]>"
   - "Lester Claudio <[email protected]>"
   - "Lukáš Zapletal <[email protected]>"
   - "Manisha Singhal <[email protected]>"
@@ -69,7 +71,7 @@ authors:
   - "metalcated <[email protected]>"
   - "russianguppie <[email protected]>"
   - "willtome <[email protected]>"
-version: "2.2.0"
+version: "3.0.0"
 license:
   - "GPL-3.0-or-later"
 tags:

diff --git a/meta/runtime.yml b/meta/runtime.yml
@@ -1,5 +1,5 @@
 ---
-requires_ansible: '>=2.8'
+requires_ansible: '>=2.9'
 plugin_routing:
   modules:
     foreman_architecture: