import rhel-system-roles-1.12.0-1.el8

.gitignore

@@ -1,16 +1,15 @@
-SOURCES/ansible-netcommon-2.4.0.tar.gz
 SOURCES/ansible-posix-1.3.0.tar.gz
 SOURCES/ansible-sshd-214df35c0bee77b5d69f49c2da269251d451b28f.tar.gz
-SOURCES/auto-maintenance-ae7a7b58983c6e1c9fb5eb930777de0d423dffeb.tar.gz
+SOURCES/auto-maintenance-792c7c0a5633b0a41edf7b1cb4d97963a585e508.tar.gz
 SOURCES/certificate-1.1.1.tar.gz
 SOURCES/cockpit-1.1.2.tar.gz
-SOURCES/community-general-4.1.0.tar.gz
+SOURCES/community-general-4.3.0.tar.gz
 SOURCES/crypto_policies-1.2.2.tar.gz
 SOURCES/firewall-1.0.1.tar.gz
 SOURCES/ha_cluster-1.3.2.tar.gz
 SOURCES/kdump-1.2.0.tar.gz
-SOURCES/kernel_settings-1.1.2.tar.gz
+SOURCES/kernel_settings-1.1.4.tar.gz
-SOURCES/logging-1.6.1.tar.gz
+SOURCES/logging-1.8.1.tar.gz
 SOURCES/metrics-1.4.0.tar.gz
 SOURCES/nbde_client-1.1.1.tar.gz
 SOURCES/nbde_server-1.1.1.tar.gz
@@ -21,4 +20,4 @@ SOURCES/ssh-1.1.3.tar.gz
 SOURCES/storage-1.6.4.tar.gz
 SOURCES/timesync-1.6.3.tar.gz
 SOURCES/tlog-1.2.2.tar.gz
-SOURCES/vpn-1.2.2.tar.gz
+SOURCES/vpn-1.3.0.tar.gz

.rhel-system-roles.metadata

@@ -1,16 +1,15 @@
-2ab6e8b033f65ed628f2f2ae41863e48da5fa96c SOURCES/ansible-netcommon-2.4.0.tar.gz
 d2d2382c38eaf34d2295aba2aa4652d75ebbaeef SOURCES/ansible-posix-1.3.0.tar.gz
 a4d4556cf6628e87fa62dec6c46099338b499930 SOURCES/ansible-sshd-214df35c0bee77b5d69f49c2da269251d451b28f.tar.gz
-6d9e4b17166cc77ec1bb5c15173aa9cc97de9ac5 SOURCES/auto-maintenance-ae7a7b58983c6e1c9fb5eb930777de0d423dffeb.tar.gz
+e1983f416ae7a092dd9bbb35c3a113ffb6048f94 SOURCES/auto-maintenance-792c7c0a5633b0a41edf7b1cb4d97963a585e508.tar.gz
 48ee051a3dc5d94acef11434b77066a863b8bf75 SOURCES/certificate-1.1.1.tar.gz
 777115229ca1eec1641b6c2c3734099bf396705a SOURCES/cockpit-1.1.2.tar.gz
-164207c245bc6aaab981a4bcee36825793547bb7 SOURCES/community-general-4.1.0.tar.gz
+52f68703d358cb96e112786c65fc8d48edd84624 SOURCES/community-general-4.3.0.tar.gz
 b1d2ff872e38037d66b41f732a3eb4bf07a78a83 SOURCES/crypto_policies-1.2.2.tar.gz
 ad6fbce3c545d6c5417b9d349a45e4b1bd4a4f87 SOURCES/firewall-1.0.1.tar.gz
 3059f16ceeb7b38468960b04e5afc92c20194956 SOURCES/ha_cluster-1.3.2.tar.gz
 1e7f3bc316ba5c2c6a7bda6f4f1d870c6966f95a SOURCES/kdump-1.2.0.tar.gz
-eb398c8dea24ee52d87ba1016ec741ede573b156 SOURCES/kernel_settings-1.1.2.tar.gz
+72bd06d25e4c841e53be7fa1330c859ac8f76a6d SOURCES/kernel_settings-1.1.4.tar.gz
-46f1b0eef0cb5030fa62b52301d22350b0a332e0 SOURCES/logging-1.6.1.tar.gz
+e530528ba5f9478cc8604aa6612388ea8e5078af SOURCES/logging-1.8.1.tar.gz
 e5d990048b0b5acbe3850dfde92b6904336624d1 SOURCES/metrics-1.4.0.tar.gz
 9b264d24e443bcd6d6bba157fab223e936ebeedb SOURCES/nbde_client-1.1.1.tar.gz
 45bfd081e56f1930d10320f1cfa4dbb895103f37 SOURCES/nbde_server-1.1.1.tar.gz
@@ -21,4 +20,4 @@ c80fe90d271a3ecc6196901377a855445916ed2f SOURCES/postfix-1.1.2.tar.gz
 32fe83a0a12ce85bc7149c2b0e496cb4131ea8ad SOURCES/storage-1.6.4.tar.gz
 f49adc8f4af4c4d25bcd1d676e29fdfec9c50210 SOURCES/timesync-1.6.3.tar.gz
 cc5577b907111e9c641f956f60f4cb4d8cb95d0b SOURCES/tlog-1.2.2.tar.gz
-070aa3eecd664187f9f10e94fc857b36e42450b6 SOURCES/vpn-1.2.2.tar.gz
+fd6d2822dbc1b3bbd8c89a63a7932c950d40f2a2 SOURCES/vpn-1.3.0.tar.gz

SPECS/rhel-system-roles.spec

@@ -1,4 +1,6 @@
-# NOTE - may revisit this once ansible-core is in 8.6
+# NOTE: Even though ansible-core is in 8.6, it is only available
+# at *runtime*, not at *buildtime* - so we can't have
+# ansible-core as a build_dep on RHEL8
 %if 0%{?fedora} || 0%{?rhel} >= 9
 %bcond_without ansible
 %global ansible_build_dep ansible-core >= 2.11.0
@@ -28,7 +30,7 @@ Name: linux-system-roles
 %endif
 Url: https://github.com/linux-system-roles
 Summary: Set of interfaces for unified system management
-Version: 1.11.0
+Version: 1.12.0
 Release: 1%{?dist}
 
 #Group: Development/Libraries
@@ -70,6 +72,16 @@ License: GPLv3+ and MIT and BSD and Python
 %endif
 %endif
 
+# ansible-core is in rhel 8.6 and later - default to ansible-core, but allow
+# the use of ansible if present - we may revisit this if the automatic dependency
+# generator is added to ansible-core in RHEL
+# Fedora - the automatic generator will add this - no need to explicit declare
+# it in the spec file
+# EL7 - no dependency on ansible because there is no ansible in el7 - user is
+# responsible for knowing they have to install ansible
+%if 0%{?rhel} >= 8
+Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0)
+%endif
 
 %if %{with ansible}
 BuildRequires: %{ansible_build_dep}
@@ -147,11 +159,11 @@ BuildRequires: %{ansible_build_dep}
 
 #%%defcommit 9 9373303b98e09ef38df7afc8d06e5e55812096c7
 %global rolename9 kernel_settings
-%deftag 9 1.1.2
+%deftag 9 1.1.4
 
 #%%defcommit 10 20dd3e5520ca06dcccaa9b3f1fb428d055e0c23f
 %global rolename10 logging
-%deftag 10 1.6.1
+%deftag 10 1.8.1
 
 #%%defcommit 11 c57d0b1f3384c525738fa26ba4bdca485e162567
 %global rolename11 nbde_server
@@ -185,7 +197,7 @@ BuildRequires: %{ansible_build_dep}
 
 #%%defcommit 18 5f6cb73e6753fbdbb219b7d3079f0378b2d3bdb3
 %global rolename18 vpn
-%deftag 18 1.2.2
+%deftag 18 1.3.0
 
 %global rolename19 firewall
 %deftag 19 1.0.1
@@ -193,7 +205,7 @@ BuildRequires: %{ansible_build_dep}
 %global rolename20 cockpit
 %deftag 20 1.1.2
 
-%global mainid ae7a7b58983c6e1c9fb5eb930777de0d423dffeb
+%global mainid 792c7c0a5633b0a41edf7b1cb4d97963a585e508
 Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz
 Source1: %{archiveurl1}
 Source2: %{archiveurl2}
@@ -216,14 +228,15 @@ Source18: %{archiveurl18}
 Source19: %{archiveurl19}
 Source20: %{archiveurl20}
 
+%if 0%{?rhel}
 # Collection tarballs from Automation Hub
 # Not used on Fedora.
 Source801: ansible-posix-1.3.0.tar.gz
-Source802: ansible-netcommon-2.4.0.tar.gz
 
 # Collection tarballs from Galaxy
 # Not used on Fedora.
-Source901: community-general-4.1.0.tar.gz
+Source901: community-general-4.3.0.tar.gz
+%endif
 
 # Script to convert the collection README to Automation Hub.
 # Not used on Fedora.
@@ -248,14 +261,9 @@ BuildRequires: highlight
 # Requirements for galaxy_transform.py
 BuildRequires: python3
 %if 0%{?fedora} || 0%{?rhel} >= 8
-BuildRequires: python3dist(ruamel.yaml)
+BuildRequires: %{py3_dist ruamel.yaml}
-Requires: python3-jmespath
-Requires: python3-netaddr
 %else
 BuildRequires: python3-ruamel-yaml
-
-Requires: python-jmespath
-Requires: python-netaddr
 %endif
 
 Obsoletes: rhel-system-roles-techpreview < 1.0-3
@@ -377,19 +385,6 @@ 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
 
-# ansible.netcommon:
-#   - filter_plugins:
-#     - Filter ipaddr for the vpn role
-declare -A module_map=( ["ipaddr.py"]="vpn" )
-for module in "${!module_map[@]}"; do
-  role="${module_map[${module}]}"
-  if [ ! -d $role/filter_plugins ]; then
-    mkdir $role/filter_plugins
-  fi
-  cp -pL .external/ansible/netcommon/plugins/filter/$module $role/filter_plugins/$module
-  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/filter_plugins/$module
-done
-
 # community.general:
 #   - library:
 #     - Module seport, sefcontext and selogin for the selinux role rolename2
@@ -473,18 +468,6 @@ LANG=en_US.utf-8 LC_ALL=en_US.utf-8 python3 release_collection.py --galaxy-yml g
     --src-path $(pwd) --dest-path $(pwd)/.collections $includes --force --no-update \
 	--src-owner %{name} --skip-git --skip-check --debug
 
-%if 0%{?rhel}
-# Convert vendored plugins to FQCN for collection
-#   ansible.netcommon:
-#     - filter_plugins:
-#       - Filter ipaddr for the vpn role
-declare -A module_map=( ["ipaddr"]="vpn" )
-for module in "${!module_map[@]}"; do
-  role="${module_map[${module}]}"
-  find .collections/ansible_collections/%{collection_namespace}/%{collection_name}/*/vpn \( -iname "*.yml" -o -iname "*.j2" \) -exec sed -i -e "s/\<$module\>/%{collection_namespace}.%{collection_name}.&/g" {} \;
-done
-%endif
-
 # copy requirements.txt and bindep.txt from auto-maintenance/lsr_role2collection
 if [ -f lsr_role2collection/collection_requirements.txt ]; then
     cp lsr_role2collection/collection_requirements.txt \
@@ -733,6 +716,22 @@ fi
 %endif
 
 %changelog
+* Thu Jan 27 2022 Rich Megginson <rmeggins@redhat.com> - 1.12.0-1
+- vpn - use custom vpn_ipaddr filter to make role work on RHEL 8.6 with ansible-core
+  this is covered by "make roles work with ansible-core on all platforms" BZ
+- logging - Logging role "logging_purge_confs" option not properly working
+  Resolves rhbz#2040812 (EL8)
+  Resolves rhbz#2039106 (EL9)
+- kernel_settings role should use ansible_managed in its configuration file
+  Resolves rhbz#2047504 (EL8)
+  Resolves rhbz#2047506 (EL9)
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Dec 14 2021 Rich Megginson <rmeggins@redhat.com> - 1.11.0-2
+- RHEL8.6, 9 - add "Requires: ansible-core or ansible"
+
 * Thu Dec 2 2021 Rich Megginson <rmeggins@redhat.com> - 1.11.0-1
 - timesync - fix ansible 2.12 issues, service_facts issues
   Resolves rhbz#2012316 (EL8)