.gitignore

@@ -4,7 +4,7 @@ SOURCES/ansible-sshd-v0.18.1.tar.gz
 SOURCES/auto-maintenance-d6a8e0167e9ed8d089093b7ead1e298241b534e1.tar.gz
 SOURCES/certificate-1.1.9.tar.gz
 SOURCES/cockpit-1.4.3.tar.gz
-SOURCES/community-general-6.3.0.tar.gz
+SOURCES/community-general-6.4.0.tar.gz
 SOURCES/containers-podman-1.10.1.tar.gz
 SOURCES/crypto_policies-1.2.7.tar.gz
 SOURCES/firewall-1.4.2.tar.gz
@@ -19,6 +19,7 @@ SOURCES/nbde_server-1.3.3.tar.gz
 SOURCES/network-1.11.2.tar.gz
 SOURCES/podman-1.1.2.tar.gz
 SOURCES/postfix-1.3.3.tar.gz
+SOURCES/rhc-1.1.3.tar.gz
 SOURCES/selinux-1.5.6.tar.gz
 SOURCES/ssh-1.1.12.tar.gz
 SOURCES/storage-1.9.6.tar.gz

.rhel-system-roles.metadata

@@ -4,7 +4,7 @@ f36cb7b1662ecda55c27f5bc15e0a22a1f11a361 SOURCES/ansible-posix-1.5.1.tar.gz
 a59d5ba01d5e536e800bc847528f16c16b961375 SOURCES/auto-maintenance-d6a8e0167e9ed8d089093b7ead1e298241b534e1.tar.gz
 0e3826af628625ef7b16e3f57b6156128fd982c0 SOURCES/certificate-1.1.9.tar.gz
 05148744a2d69d469dc3c678bb1a9fb9747dea26 SOURCES/cockpit-1.4.3.tar.gz
-b97ec0ef0ff1390c137323192527129159b7c76f SOURCES/community-general-6.3.0.tar.gz
+687a4e36e9d8f73a8a44a448da1c205eb0ce5f1c SOURCES/community-general-6.4.0.tar.gz
 ccb070885fd455bb6e7f2b8ca050d40d30609fec SOURCES/containers-podman-1.10.1.tar.gz
 47e3a2db8790c98fd5c09ab1887318b6ba56ce49 SOURCES/crypto_policies-1.2.7.tar.gz
 1c414411b4960040eebcef2ddd528eea0b47f05f SOURCES/firewall-1.4.2.tar.gz
@@ -19,6 +19,7 @@ cf27267d3d54f1537ddda89f6d4db7abbe55b357 SOURCES/nbde_client-1.2.10.tar.gz
 857b1c3ea5a1a48dc964fb5c139861ba01c9e732 SOURCES/network-1.11.2.tar.gz
 fe48a68775bcb87daf3f62ab58a1998ffaa4e6be SOURCES/podman-1.1.2.tar.gz
 9244301089661fecca31dfee431b32d4876063be SOURCES/postfix-1.3.3.tar.gz
+2340277be032405d0ed2be00ff3971837180c5cb SOURCES/rhc-1.1.3.tar.gz
 bac983e0dcc5041a4c7d4d25849ed31aaf462df7 SOURCES/selinux-1.5.6.tar.gz
 1bb35bc413249ce3209e471687afd60e0e25dddb SOURCES/ssh-1.1.12.tar.gz
 0eea1b45136cb807740fa12435b02eccdb35a7ac SOURCES/storage-1.9.6.tar.gz

SOURCES/CHANGELOG.md

@@ -1,7 +1,30 @@
 Changelog
 =========
 
-[1.21.0-1] - 2023-02-20
+[1.21.2] - 2023-06-12
+----------------------------
+
+### New Features
+
+- none
+
+### Bug Fixes
+
+- [rhc - activation key registration fails if system is already registered](https://bugzilla.redhat.com/show_bug.cgi?id=2214283)
+- [rhc - system role does not apply Insights tags](https://bugzilla.redhat.com/show_bug.cgi?id=2214287)
+
+[1.21.1] - 2023-03-16
+----------------------------
+
+### New Features
+
+- [rhc - New Role - Red Hat subscription management, insights management](https://bugzilla.redhat.com/show_bug.cgi?id=2144877)
+
+### Bug Fixes
+
+- none
+
+[1.21.0] - 2023-02-20
 ----------------------------
 
 ### New Features

SOURCES/extrasources.inc

@@ -1,9 +1,9 @@
 Source801: https://galaxy.ansible.com/download/ansible-posix-1.5.1.tar.gz
-Source901: https://galaxy.ansible.com/download/community-general-6.3.0.tar.gz
+Source901: https://galaxy.ansible.com/download/community-general-6.4.0.tar.gz
 Source902: https://galaxy.ansible.com/download/containers-podman-1.10.1.tar.gz
 
 Provides: bundled(ansible-collection(ansible.posix)) = 1.5.1
-Provides: bundled(ansible-collection(community.general)) = 6.3.0
+Provides: bundled(ansible-collection(community.general)) = 6.4.0
 Provides: bundled(ansible-collection(containers.podman)) = 1.10.1
 
 Source996: CHANGELOG.rst

SPECS/rhel-system-roles.spec

@@ -29,8 +29,8 @@ Name: linux-system-roles
 %endif
 Url: https://github.com/linux-system-roles
 Summary: Set of interfaces for unified system management
-Version: 1.21.0
-Release: 2%{?dist}
+Version: 1.21.2
+Release: 1%{?dist}
 
 License: GPLv3+ and MIT and BSD and Python
 %global _pkglicensedir %{_licensedir}/%{name}
@@ -179,8 +179,8 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar
 %global rolename22 ad_integration
 %deftag 22 1.0.2
 
-#%%global rolename23 rhc
-#%%deftag 23 1.1.0
+%global rolename23 rhc
+%deftag 23 1.1.3
 
 %global rolename24 journald
 %deftag 24 1.0.0
@@ -207,11 +207,12 @@ Source19: %{archiveurl19}
 Source20: %{archiveurl20}
 Source21: %{archiveurl21}
 Source22: %{archiveurl22}
-#Source23: %{archiveurl23}
+Source23: %{archiveurl23}
 Source24: %{archiveurl24}
 # END AUTOGENERATED SOURCES
 
 # Includes with definitions/tags that differ between RHEL and Fedora
+Source2301: redhat_subscription.py
 Source1001: extrasources.inc
 
 %include %{SOURCE1001}
@@ -275,8 +276,7 @@ end
 
 %prep
 # BEGIN AUTOGENERATED SETUP
-#%%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -n %{getarchivedir 0}
-%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a24 -n %{getarchivedir 0}
+%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -n %{getarchivedir 0}
 # END AUTOGENERATED SETUP
 
 %if 0%{?rhel}
@@ -373,8 +373,8 @@ done
 #     - Module seport, sefcontext and selogin for the selinux role rolename2
 #     - Module ini_file for role tlog
 #     - rhc modules
-#  ["redhat_subscription.py"]="rhc" ["rhsm_release.py"]="rhc" ["rhsm_repository.py"]="rhc" )
-module_map=( ["seport.py"]="selinux" ["sefcontext.py"]="selinux" ["selogin.py"]="selinux" ["ini_file.py"]="tlog" )
+module_map=( ["seport.py"]="selinux" ["sefcontext.py"]="selinux" ["selogin.py"]="selinux" ["ini_file.py"]="tlog"
+             ["redhat_subscription.py"]="rhc" ["rhsm_release.py"]="rhc" ["rhsm_repository.py"]="rhc" )
 for module in "${!module_map[@]}"; do
   role="${module_map[${module}]}"
   if [ ! -d $role/library ]; then
@@ -393,6 +393,10 @@ for module in "${!module_map[@]}"; do
   sed -i -e ':a;N;$!ba;s/description:\n\( *\)/description:\n\1- WARNING: Do not use this module directly! It is only for role internal use.\n\1/' $role/library/$module
 done
 
+# Fix until the updated redhat_subscription.py is in community.general
+cp %{SOURCE2301} rhc/library/redhat_subscription.py
+sed -i -e ':a;N;$!ba;s/description:\n\( *\)/description:\n\1- WARNING: Do not use this module directly! It is only for role internal use.\n\1/' rhc/library/redhat_subscription.py
+
 # containers.podman:
 #   - library:
 #     - Module podman_container_info, podman_image and podman_play for the podman role
@@ -749,6 +753,14 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \
 %endif
 
 %changelog
+* Mon Jun 12 2023 Rich Megginson <rmeggins@redhat.com> - 1.21.2-1
+- Resolves:rhbz#2214283 : rhc - activation key registration fails if system is already registered
+- Resolves:rhbz#2214287 : rhc - system role does not apply Insights tags
+
+* Thu Mar 16 2023 Rich Megginson <rmeggins@redhat.com> - 1.21.1-1
+- Resolves:rhbz#2144877 : rhc - new role for subscription management/registration/insights
+- includes the fix for tests_proxy.yml selinux and some test refactoring
+
 * Wed Feb 22 2023 Rich Megginson <rmeggins@redhat.com> - 1.21.0-2
 - Resolves:rhbz#2144877 : rhc - new role for subscription management/registration/insights
 - remove role until https://bugzilla.redhat.com/show_bug.cgi?id=2171829 is fixed