Import from AlmaLinux stable repository

2024-05-31 17:06:27 +00:00 · 2024-05-31 17:06:27 +00:00 · 260649931c
commit 260649931c
parent 0afba46f9c
9 changed files with 687 additions and 1502 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,28 +1,34 @@
-SOURCES/ad_integration-1.0.2.tar.gz
-SOURCES/ansible-posix-1.5.1.tar.gz
-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.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
-SOURCES/ha_cluster-1.8.7.tar.gz
-SOURCES/journald-1.0.0.tar.gz
-SOURCES/kdump-1.2.6.tar.gz
-SOURCES/kernel_settings-1.1.11.tar.gz
-SOURCES/logging-1.11.5.tar.gz
-SOURCES/metrics-1.8.1.tar.gz
-SOURCES/nbde_client-1.2.10.tar.gz
-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
-SOURCES/timesync-1.7.2.tar.gz
-SOURCES/tlog-1.2.11.tar.gz
-SOURCES/vpn-1.5.3.tar.gz
+SOURCES/ad_integration-1.4.2.tar.gz
+SOURCES/ansible-posix-1.5.4.tar.gz
+SOURCES/ansible-sshd-v0.23.2.tar.gz
+SOURCES/auto-maintenance-11ad785c9bb72611244e7909450ca4247e12db4d.tar.gz
+SOURCES/bootloader-1.0.3.tar.gz
+SOURCES/certificate-1.3.3.tar.gz
+SOURCES/cockpit-1.5.5.tar.gz
+SOURCES/community-general-8.3.0.tar.gz
+SOURCES/containers-podman-1.12.0.tar.gz
+SOURCES/crypto_policies-1.3.2.tar.gz
+SOURCES/fapolicyd-1.1.1.tar.gz
+SOURCES/firewall-1.7.4.tar.gz
+SOURCES/ha_cluster-1.14.0.tar.gz
+SOURCES/journald-1.2.3.tar.gz
+SOURCES/kdump-1.4.4.tar.gz
+SOURCES/kernel_settings-1.2.2.tar.gz
+SOURCES/keylime_server-1.1.2.tar.gz
+SOURCES/logging-1.12.4.tar.gz
+SOURCES/metrics-1.10.1.tar.gz
+SOURCES/nbde_client-1.2.17.tar.gz
+SOURCES/nbde_server-1.4.3.tar.gz
+SOURCES/network-1.15.1.tar.gz
+SOURCES/podman-1.4.7.tar.gz
+SOURCES/postfix-1.4.3.tar.gz
+SOURCES/postgresql-1.3.5.tar.gz
+SOURCES/rhc-1.6.0.tar.gz
+SOURCES/selinux-1.7.4.tar.gz
+SOURCES/snapshot-1.3.1.tar.gz
+SOURCES/ssh-1.3.2.tar.gz
+SOURCES/storage-1.16.2.tar.gz
+SOURCES/systemd-1.1.2.tar.gz
+SOURCES/timesync-1.8.2.tar.gz
+SOURCES/tlog-1.3.3.tar.gz
+SOURCES/vpn-1.6.3.tar.gz
--- a/.rhel-system-roles.metadata
+++ b/.rhel-system-roles.metadata
@ -1,28 +0,0 @@
-c531e83edf95f96389a6c1c10ea80ccd2b42cc75 SOURCES/ad_integration-1.0.2.tar.gz
-f36cb7b1662ecda55c27f5bc15e0a22a1f11a361 SOURCES/ansible-posix-1.5.1.tar.gz
-71c988d6ad9b916727cd93b8e2a2154183f5035a SOURCES/ansible-sshd-v0.18.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
-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
-7cfd7d6fa2164fcb757a316e123cbe048f8f0ac9 SOURCES/ha_cluster-1.8.7.tar.gz
-97edc58624de8ccb3f4b628a48811094a0dc1513 SOURCES/journald-1.0.0.tar.gz
-439ea600c242c914c90933f287f3caf8c7869c12 SOURCES/kdump-1.2.6.tar.gz
-49f4bc8f273339cde0cdecccffa7b902359b2601 SOURCES/kernel_settings-1.1.11.tar.gz
-7fe83b26f954e55a282a4d5398e3064a7783a83a SOURCES/logging-1.11.5.tar.gz
-e217af697b4e3205177360726f579d01b145be77 SOURCES/metrics-1.8.1.tar.gz
-cf27267d3d54f1537ddda89f6d4db7abbe55b357 SOURCES/nbde_client-1.2.10.tar.gz
-274986399c55eb35f281173621e75eb2d7ae00e6 SOURCES/nbde_server-1.3.3.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
-fefc5b4bd9635bb8fe70a9af9fc178cb5d3e8193 SOURCES/timesync-1.7.2.tar.gz
-07c42ba749c110a87469a5c477579582c4d0c538 SOURCES/tlog-1.2.11.tar.gz
-5b5ee7283092a16e9ec1aba47ee651274f784416 SOURCES/vpn-1.5.3.tar.gz
--- a/SOURCES/CHANGELOG.md
+++ b/SOURCES/CHANGELOG.md
@ -1,17 +1,105 @@
 Changelog
 =========
-
-[1.21.2] - 2023-06-12
+[1.23.0] - 2024-01-15
 ----------------------------

 ### New Features

- none
+- [RHEL for Edge support in system roles](https://issues.redhat.com/browse/RHEL-15872)
+- [ad_integration - feat: Add sssd custom settings](https://issues.redhat.com/browse/RHEL-17667)
+- [ad_integration - Enable AD dynamic DNS updates](https://issues.redhat.com/browse/RHEL-1119)
+- [ad_integration - feat: add ad_integration_preserve_authselect_profile](https://issues.redhat.com/browse/RHEL-21383)
+- [ad_integration - feat: Add SSSD parameters support](https://issues.redhat.com/browse/RHEL-21134)
+- [bootloader - Create bootloader role (MVP)](https://issues.redhat.com/browse/RHEL-3241)
+- [fapolicyd - feat: Import code for fapolicyd system role](https://issues.redhat.com/browse/RHEL-16542)
+- [ha_cluster - [RFE] HA Cluster system role should be able to enable Resilient Storage repository](https://issues.redhat.com/browse/RHEL-14090)
+- [ha_cluster - [FutureFeature] Allow ha_cluster role to configure fencing topology](https://issues.redhat.com/browse/RHEL-4624)
+- [ha_cluster - [FutureFeature] Allow ha_cluster role to configure all qdevice options](https://issues.redhat.com/browse/RHEL-3264)
+- [ha_cluster - Setting cluster members attributes](https://issues.redhat.com/browse/RHEL-22108)
+- [journald - feat: Add support for ForwardToSyslog](https://issues.redhat.com/browse/RHEL-21123)
+- [logging - feat: Add support for the global config option preserveFQDN with a new logg…](https://issues.redhat.com/browse/RHEL-15933)
+- [logging - feat: Add support for general queue and general action parameters](https://issues.redhat.com/browse/RHEL-15440)
+- [metrics - [RFE] Metrics system role support for configuring PMIE webhooks](https://issues.redhat.com/browse/RHEL-18170)
+- [network - Add blackhole type route](https://issues.redhat.com/browse/RHEL-21491)
+- [postgresql - feat: Enable support for Postgresql 16](https://issues.redhat.com/browse/RHEL-18963)
+- [rhc - support RHEL 7 managed nodes](https://issues.redhat.com/browse/RHEL-16977)
+- [rhc - new rhc_insights.ansible_host parameter](https://issues.redhat.com/browse/RHEL-16975)
+- [rhc - new rhc_insights.display_name parameter](https://issues.redhat.com/browse/RHEL-16965)
+- [snapshot - New Role for storage snapshot management (lvm, etc.)](https://issues.redhat.com/browse/RHEL-16553)
+- [sshd - ansible-sshd Manage SSH certificates](https://issues.redhat.com/browse/RHEL-5985)
+- [storage - feat: Support for creating volumes without a FS](https://issues.redhat.com/browse/RHEL-16213)
+- [storage - Basic support for creating shared logical volumes (RHEL 8)](https://issues.redhat.com/browse/RHEL-14022)

 ### 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)
+- [ha_cluster - high-availability firewall service is not added on qdevice node](https://issues.redhat.com/browse/RHEL-17874)
+- [ha_cluster - Timeout issue between SBD with delay-start and systemd unit](https://issues.redhat.com/browse/RHEL-4684)
+- [kdump - fix: retry read of kexec_crash_size](https://issues.redhat.com/browse/RHEL-3354)
+- [keylime_server - won't detect registrar start failure](https://issues.redhat.com/browse/RHEL-21946)
+- [logging - fix: check that logging_max_message_size is set, not rsyslog_max_message_size](https://issues.redhat.com/browse/RHEL-15038)
+- [nbde_server - fix: Allow tangd socket override directory to be managed outside of the role](https://issues.redhat.com/browse/RHEL-25509)
+- [network - Ansible RHEL network system role issue with ipv6.routing-rules the prefix length for 'from' cannot be zero"](https://issues.redhat.com/browse/RHEL-16501)
+- [podman - fix: cast secret data to string in order to allow JSON valued strings](https://issues.redhat.com/browse/RHEL-22310)
+- [podman - fix: name of volume quadlet service should be basename-volume.service](https://issues.redhat.com/browse/RHEL-21402)
+- [podman - fix: add no_log: true for tasks that can log secret data](https://issues.redhat.com/browse/RHEL-19242)
+- [podman - fix: user linger needed before secrets](https://issues.redhat.com/browse/RHEL-22229)
+- [postgresql - PostgreSQL system role: unable to install PostgreSQL version 15 on RHEL 9](https://issues.redhat.com/browse/RHEL-21400)
+- [selinux - fix: Use `ignore_selinux_state` module option](https://issues.redhat.com/browse/RHEL-15871)
+- [selinux - fix: Print an error message when module to be created doesn't exist](https://issues.redhat.com/browse/RHEL-19044)
+- [selinux - fix: no longer use "item" as a loop variable](https://issues.redhat.com/browse/RHEL-19042)
+
+[1.22.0] - 2023-08-15
+----------------------------
+
+### New Features
+
+- [ALL - fingerprint in config files managed by roles](https://bugzilla.redhat.com/show_bug.cgi?id=2186910)
+- [ad_integration - add ad_integration_force_rejoin](https://bugzilla.redhat.com/show_bug.cgi?id=2211723)
+- [certificate - add mode parameter to change permissions for cert files](https://bugzilla.redhat.com/show_bug.cgi?id=2218204)
+- [firewall - missing module in linux-system-roles.firewall to create an ipset](https://bugzilla.redhat.com/show_bug.cgi?id=2140880)
+- [firewall - fix: reload on resetting to defaults](https://bugzilla.redhat.com/show_bug.cgi?id=2224648)
+- [firewall - should have option to disable conflicting services](https://bugzilla.redhat.com/show_bug.cgi?id=2222809)
+- [ha_cluster - Add possibility to load SBD watchdog kernel modules](https://bugzilla.redhat.com/show_bug.cgi?id=2190478)
+- [ha_cluster - cluster and quorum can have distinct passwords](https://bugzilla.redhat.com/show_bug.cgi?id=2216485)
+- [ha_cluster - support for resource and operation defaults](https://bugzilla.redhat.com/show_bug.cgi?id=2190483)
+- [kdump - support auto_reset_crashkernel, dracut_args, deprecate /etc/sysconfig/kdump](https://bugzilla.redhat.com/show_bug.cgi?id=2211272)
+- [keylime_server - system role for managing keylime servers](https://bugzilla.redhat.com/show_bug.cgi?id=2224387)
+- [network - Support configuring auto-dns setting](https://bugzilla.redhat.com/show_bug.cgi?id=2211273)
+- [network - Support no-aaaa DNS option](https://bugzilla.redhat.com/show_bug.cgi?id=2218595)
+- [podman - allow container networking configuration](https://bugzilla.redhat.com/show_bug.cgi?id=2220963)
+- [podman - support for healthchecks and healthcheck actions](https://bugzilla.redhat.com/show_bug.cgi?id=2220961)
+- [podman - support quadlet units](https://bugzilla.redhat.com/show_bug.cgi?id=2220962)
+- [postgresql - [RFE] system role for PostgreSQL management](https://bugzilla.redhat.com/show_bug.cgi?id=2151371)
+- [rhc - implement rhc_proxy.scheme](https://bugzilla.redhat.com/show_bug.cgi?id=2211778)
+- [rhc - [RFE] New role for Red Hat subscription management, insights management [rhel-8.9.0]](https://bugzilla.redhat.com/show_bug.cgi?id=2179016)
+- [ssh - add ssh_backup option with default true](https://bugzilla.redhat.com/show_bug.cgi?id=2216759)
+- [storage - RFE for the storage system role to support configuring the stripe size for RAID LVM volumes](https://bugzilla.redhat.com/show_bug.cgi?id=2141961)
+- [storage - [RFE] user-specified mount point owner and permissions](https://bugzilla.redhat.com/show_bug.cgi?id=2181661)
+- [systemd - system role for managing systemd units](https://bugzilla.redhat.com/show_bug.cgi?id=2224388)
+
+### Bug Fixes
+
+- [ALL - facts being gathered unnecessarily](https://bugzilla.redhat.com/show_bug.cgi?id=2223036)
+- [ad_integration - leaks credentials when in check_mode](https://bugzilla.redhat.com/show_bug.cgi?id=2233183)
+- [certificate - rhel-system-roles.certificate does not re-issue after updating key_size](https://bugzilla.redhat.com/show_bug.cgi?id=2186057)
+- [firewall - fix: reload on resetting to defaults](https://bugzilla.redhat.com/show_bug.cgi?id=2224648)
+- [firewall - Check mode fails with replacing previous rules](https://issues.redhat.com/browse/RHEL-899)
+- [firewall - Check mode fails when creating new firewall service](https://bugzilla.redhat.com/show_bug.cgi?id=2222433)
+- [firewall - Ansible RHEL firewall system role not idempotent when configuring the interface using the role in rhel9](https://issues.redhat.com/browse/RHEL-918)
+- [firewall - Don't install python(3)-firewall it's a dependency of firewalld](https://bugzilla.redhat.com/show_bug.cgi?id=2216521)
+- [firewall - fix: files: overwrite firewalld.conf on previous replaced](https://issues.redhat.com/browse/RHEL-1496)
+- [kdump - use failure_action instead of default on EL9 and later](https://issues.redhat.com/browse/RHEL-907)
+- [kdump - role: "Write new authorized_keys if needed" task idempotency issues](https://bugzilla.redhat.com/show_bug.cgi?id=2232391)
+- [kdump - system role fails if kdump_ssh_user doesn't have a .ssh/authorized_keys file in home directory](https://bugzilla.redhat.com/show_bug.cgi?id=2232392)
+- [kdump - fix: ensure .ssh directory exists for kdump_ssh_user on kdump_ssh_server](https://issues.redhat.com/browse/RHEL-1398)
+- [kdump - fix: Ensure authorized_keys management works with multiple hosts](https://issues.redhat.com/browse/RHEL-1500)
+- [podman - Podman system role:  Unable to use podman_registries_conf to set unqualified-search-registries](https://bugzilla.redhat.com/show_bug.cgi?id=2226077)
+- [rhc - system role does not apply Insights tags](https://bugzilla.redhat.com/show_bug.cgi?id=2209441)
+- [storage - Cannot set chunk size for RAID: Unsupported parameters for (blivet) module: pools.raid_chunk_size](https://bugzilla.redhat.com/show_bug.cgi?id=2193057)
+- [storage - RAID volume pre cleanup - remove existing data from member disks as needed before creation](https://bugzilla.redhat.com/show_bug.cgi?id=2224094)
+- [storage - Storage: mounted devices that are in use cannot be resized](https://bugzilla.redhat.com/show_bug.cgi?id=2168738)
+- [storage - fix: use stat.pw_name, stat.gr_name instead of owner, group](https://issues.redhat.com/browse/RHEL-1498)
+- [tlog - use the proxy provider - the files provider is deprecated in sssd](https://bugzilla.redhat.com/show_bug.cgi?id=2191702)

 [1.21.1] - 2023-03-16
 ----------------------------
--- a/SOURCES/ansible-packaging.inc
+++ b/SOURCES/ansible-packaging.inc
@ -0,0 +1,21 @@
+# Helper macros originally from macros.ansible by Igor Raits <ignatenkobrain>
+# This file is for maintaining the compatibility with macros and other
+# functionality (generators) provided by ansible-packaging on Fedora.
+
+Provides: ansible-collection(%{collection_namespace}.%{collection_name}) = %{collection_version}
+
+# ansible-galaxy is available by ansible-core on RHEL 8.6 and newer at buildtime.
+%define ansible_collection_build() ansible-galaxy collection build
+%define ansible_collection_install() ansible-galaxy collection install -n -p %{buildroot}%{_datadir}/ansible/collections %{collection_namespace}-%{collection_name}-%{version}.tar.gz
+
+%define ansible_roles_dir %{_datadir}/ansible/roles
+%define ansible_collections_dir %{_datadir}/ansible/collections/ansible_collections
+
+# TODO: Officially deprecate this macro and add the following line to the macro
+# def after the new approach has gotten more testing and adoption:
+# %%{warn: %%{ansible_collection_files} is deprecated. Use %%files -f %%{ansible_collection_filelist} instead.}
+%define ansible_collection_files %{shrink:
+%{ansible_collections_dir}/%{collection_namespace}/
+}
+
+%define ansible_collection_filelist %{__ansible_builddir}/ansible_collection_files
--- a/SOURCES/extrasources.inc
+++ b/SOURCES/extrasources.inc
@ -1,10 +1,10 @@
-Source801: https://galaxy.ansible.com/download/ansible-posix-1.5.1.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
+Source801: https://galaxy.ansible.com/download/ansible-posix-1.5.4.tar.gz
+Source901: https://galaxy.ansible.com/download/community-general-8.3.0.tar.gz
+Source902: https://galaxy.ansible.com/download/containers-podman-1.12.0.tar.gz

-Provides: bundled(ansible-collection(ansible.posix)) = 1.5.1
-Provides: bundled(ansible-collection(community.general)) = 6.4.0
-Provides: bundled(ansible-collection(containers.podman)) = 1.10.1
+Provides: bundled(ansible-collection(ansible.posix)) = 1.5.4
+Provides: bundled(ansible-collection(community.general)) = 8.3.0
+Provides: bundled(ansible-collection(containers.podman)) = 1.12.0

 Source996: CHANGELOG.rst
 Source998: collection_readme.sh
--- a/SOURCES/redhat_subscription.py
+++ b/SOURCES/redhat_subscription.py
--- a/SOURCES/vendoring-build.inc
+++ b/SOURCES/vendoring-build.inc
@ -0,0 +1,102 @@
+# maps the source file to the roles that use that file
+# value can be string or space delimited list of strings
+# role name `__collection` means - do not vendor into
+# role, just vendor directly into the collection
+declare -A plugin_map=(
+  [ansible/posix/plugins/modules/selinux.py]=selinux
+  [ansible/posix/plugins/modules/seboolean.py]=selinux
+  [ansible/posix/plugins/modules/mount.py]=storage
+  [ansible/posix/plugins/modules/rhel_facts.py]=__collection
+  [ansible/posix/plugins/modules/rhel_rpm_ostree.py]=__collection
+  [ansible/posix/plugins/module_utils/mount.py]=storage
+  [community/general/plugins/modules/ini_file.py]="tlog ad_integration"
+  [community/general/plugins/modules/modprobe.py]=ha_cluster
+  [community/general/plugins/modules/redhat_subscription.py]=rhc
+  [community/general/plugins/modules/rhsm_release.py]=rhc
+  [community/general/plugins/modules/rhsm_repository.py]=rhc
+  [community/general/plugins/modules/seport.py]=selinux
+  [community/general/plugins/modules/sefcontext.py]=selinux
+  [community/general/plugins/modules/selogin.py]=selinux
+  [containers/podman/plugins/modules/podman_container_info.py]=podman
+  [containers/podman/plugins/modules/podman_image.py]=podman
+  [containers/podman/plugins/modules/podman_play.py]=podman
+  [containers/podman/plugins/modules/podman_secret.py]=podman
+  [containers/podman/plugins/module_utils/podman/common.py]=podman
+)
+
+declare -a modules mod_utils collection_plugins
+declare -A dests
+# vendor in plugin files - fix documentation, fragments
+for src in "${!plugin_map[@]}"; do
+  roles="${plugin_map["$src"]}"
+  if [ "$roles" = __collection ]; then
+    collection_plugins+=("$src")
+  else
+    case "$src" in
+    */plugins/modules/*) srcdir=plugins/modules; subdir=library; modules+=("$src") ;;
+    */plugins/module_utils/*) srcdir=plugins/module_utils; mod_utils+=("$src") ;;
+    */plugins/action/*) srcdir=plugins/action ;;
+    esac
+  fi
+  for role in $roles; do
+    if [ "$role" = __collection ]; then
+      dest="%{collection_build_path}/plugins${src/#*plugins/}"
+      dests["$dest"]=__collection
+    else
+      case "$src" in
+      */plugins/module_utils/*) subdir="module_utils/${role}_lsr" ;;
+      esac
+      dest="$role/${src/#*${srcdir}/${subdir}}"
+      dests["$dest"]="$role"
+    fi
+    destdir="$(dirname "$dest")"
+    if [ ! -d "$destdir" ]; then
+      mkdir -p "$destdir"
+    fi
+    cp -pL ".external/$src" "$dest"
+    sed -e ':a;N;$!ba;s/description:\n\( *\)/description:\n\1- WARNING: Do not use this plugin directly! It is only for role internal use.\n\1/' \
+      -e '/^extends_documentation_fragment:/,/^[^ -]/{/^extends/d;/^[ -]/d}' \
+      -i "$dest"
+  done
+done
+
+# remove the temporary .external directory after vendoring
+rm -rf .external
+
+# fix python imports to point from the old name to the new name
+for dest in "${!dests[@]}"; do
+  role="${dests["$dest"]}"
+  for module in "${modules[@]}"; do
+    python_name="$(dirname "$module")"
+    python_name="${python_name////[.]}"
+    sed -e "s/ansible_collections[.]${python_name}[.]/ansible.modules./" -i "$dest"
+  done
+  for mod_util in "${mod_utils[@]}"; do
+    # some mod_utils have subdirs, some do not
+    split=(${mod_util//// })
+    python_name="ansible_collections[.]${split[0]}[.]${split[1]}[.]plugins[.]module_utils[.]"
+    sed -e "s/${python_name}/ansible.module_utils.${role}_lsr./" -i "$dest"
+  done
+  for plugin in "${collection_plugins[@]}"; do
+    python_name="$(dirname "$plugin")"
+    dest_python_name="%{collection_namespace}/%{collection_name}/plugins${python_name/#*plugins/}"
+    src_python_name="ansible_collections.${python_name////[.]}"
+    dest_python_name="ansible_collections.${dest_python_name////.}"
+    sed -e "s/${src_python_name}/${dest_python_name}/" -i "$dest"
+  done
+done
+
+# Replacing "linux-system-roles.rolename" with "rhel-system-roles.rolename" in each role
+# Replacing "fedora.linux_system_roles." with "redhat.rhel_system_roles" in each role
+# This is for the "roles calling other roles" case
+# for podman, change the FQCN - using a non-FQCN module name doesn't seem to work,
+# even for the legacy role format
+for rolename in %{rolenames}; do
+    find "$rolename" -type f -exec \
+         sed -e "s/linux-system-roles[.]${rolename}\\>/%{roleinstprefix}${rolename}/g" \
+             -e "s/fedora[.]linux_system_roles[.]/%{collection_namespace}.%{collection_name}./g" \
+             -e "s/containers[.]podman[.]/%{collection_namespace}.%{collection_name}./g" \
+             -e "s/community[.]general[.]/%{collection_namespace}.%{collection_name}./g" \
+             -e "s/ansible[.]posix[.]/%{collection_namespace}.%{collection_name}./g" \
+             -i {} \;
+done
--- a/SOURCES/vendoring-prep.inc
+++ b/SOURCES/vendoring-prep.inc
@ -0,0 +1,12 @@
+# Untar vendored collection tarballs to corresponding directories
+for file in %{SOURCE801} %{SOURCE901} %{SOURCE902}; do
+    if [[ "$(basename $file)" =~ ([^-]+)-([^-]+)-(.+).tar.gz ]]; then
+        ns=${BASH_REMATCH[1]}
+        name=${BASH_REMATCH[2]}
+        ver=${BASH_REMATCH[3]}
+        mkdir -p .external/$ns/$name
+        pushd .external/$ns/$name > /dev/null
+        tar xfz "$file"
+        popd > /dev/null
+    fi
+done
--- a/SPECS/rhel-system-roles.spec
+++ b/SPECS/rhel-system-roles.spec
@ -1,27 +1,16 @@
-# 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
+# NOTE: ansible-core is in rhel-8.6 and newer, but not installable
+# in buildroot as it depended on modular Python.
+# It has been installable at buildtime in 8.8 and newer.
 %if 0%{?fedora}
 BuildRequires: ansible-packaging
 %else
+%if 0%{?rhel} >= 8
 BuildRequires: ansible-core >= 2.11.0
 %endif
-%else
-%bcond_with ansible
 %endif

 %bcond_with collection_artifact

-%if 0%{?fedora} || 0%{?rhel} >= 8
-%bcond_without html
-%else
-# pandoc is not supported in rhel 7 and older,
-# which is needed for converting .md to .html.
-%bcond_with html
-%endif
-
 %if 0%{?rhel}
 Name: rhel-system-roles
 %else
@ -29,8 +18,8 @@ Name: linux-system-roles
 %endif
 Url: https://github.com/linux-system-roles
 Summary: Set of interfaces for unified system management
-Version: 1.21.2
-Release: 1%{?dist}
+Version: 1.23.0
+Release: 2.21%{?dist}

 License: GPLv3+ and MIT and BSD and Python
 %global _pkglicensedir %{_licensedir}/%{name}
@ -44,25 +33,10 @@ License: GPLv3+ and MIT and BSD and Python
 %endif

 %global collection_version %{version}
+# this is where we stage the collection files for building
+%global collection_dest_path .collections
+%global collection_build_path %{collection_dest_path}/ansible_collections/%{collection_namespace}/%{collection_name}

-# Helper macros originally from macros.ansible by Igor Raits <ignatenkobrain>
-# On RHEL, not available, so we must define those macros locally
-# On Fedora, provided by ansible-packager
-# Not used (yet). Could be made to point to AH in RHEL - but what about CentOS Stream?
-#%%{!?ansible_collection_url:%%define ansible_collection_url() https://galaxy.ansible.com/%%{collection_namespace}/%%{collection_name}}
-%if 0%{?rhel}
-Provides: ansible-collection(%{collection_namespace}.%{collection_name}) = %{collection_version}
-%global ansible_collection_files %{_datadir}/ansible/collections/ansible_collections/%{collection_namespace}/
-%define ansible_roles_dir %{_datadir}/ansible/roles
-%if %{without ansible}
-# Untar and copy everything instead of galaxy-installing the built artifact when ansible is not available
-%define ansible_collection_build() tar -cf %{_tmppath}/%{collection_namespace}-%{collection_name}-%{version}.tar.gz .
-%define ansible_collection_install() mkdir -p %{buildroot}%{ansible_collection_files}%{collection_name}; (cd %{buildroot}%{ansible_collection_files}%{collection_name}; tar -xf %{_tmppath}/%{collection_namespace}-%{collection_name}-%{version}.tar.gz)
-%else
-%define ansible_collection_build() ansible-galaxy collection build
-%define ansible_collection_install() ansible-galaxy collection install -n -p %{buildroot}%{_datadir}/ansible/collections %{collection_namespace}-%{collection_name}-%{version}.tar.gz
-%endif
-%endif
 # be compatible with the usual Fedora Provides:
 Provides: ansible-collection-%{collection_namespace}-%{collection_name} = %{collection_version}-%{release}

@ -107,83 +81,101 @@ Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0)
 %%global rolestodir %%{?rolestodir} %%{roletodir%{1}}
 }

-%global mainid d6a8e0167e9ed8d089093b7ead1e298241b534e1
+%global mainid 11ad785c9bb72611244e7909450ca4247e12db4d
 Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz

 # BEGIN AUTOGENERATED SOURCES
 %global rolename1 postfix
-%deftag 1 1.3.3
+%deftag 1 1.4.3

 %global rolename2 selinux
-%deftag 2 1.5.6
+%deftag 2 1.7.4

 %global rolename3 timesync
-%deftag 3 1.7.2
+%deftag 3 1.8.2

 %global rolename4 kdump
-%deftag 4 1.2.6
+%deftag 4 1.4.4

 %global rolename5 network
-%deftag 5 1.11.2
+%deftag 5 1.15.1

 %global rolename6 storage
-%deftag 6 1.9.6
+%deftag 6 1.16.2

 %global rolename7 metrics
-%deftag 7 1.8.1
+%deftag 7 1.10.1

 %global rolename8 tlog
-%deftag 8 1.2.11
+%deftag 8 1.3.3

 %global rolename9 kernel_settings
-%deftag 9 1.1.11
+%deftag 9 1.2.2

 %global rolename10 logging
-%deftag 10 1.11.5
+%deftag 10 1.12.4

 %global rolename11 nbde_server
-%deftag 11 1.3.3
+%deftag 11 1.4.3

 %global rolename12 nbde_client
-%deftag 12 1.2.10
+%deftag 12 1.2.17

 %global rolename13 certificate
-%deftag 13 1.1.9
+%deftag 13 1.3.3

 %global rolename14 crypto_policies
-%deftag 14 1.2.7
+%deftag 14 1.3.2

 %global forgeorg15 https://github.com/willshersystems
 %global repo15 ansible-sshd
 %global rolename15 sshd
-%deftag 15 v0.18.1
+%deftag 15 v0.23.2

 %global rolename16 ssh
-%deftag 16 1.1.12
+%deftag 16 1.3.2

 %global rolename17 ha_cluster
-%deftag 17 1.8.7
+%deftag 17 1.14.0

 %global rolename18 vpn
-%deftag 18 1.5.3
+%deftag 18 1.6.3

 %global rolename19 firewall
-%deftag 19 1.4.2
+%deftag 19 1.7.4

 %global rolename20 cockpit
-%deftag 20 1.4.3
+%deftag 20 1.5.5

 %global rolename21 podman
-%deftag 21 1.1.2
+%deftag 21 1.4.7

 %global rolename22 ad_integration
-%deftag 22 1.0.2
+%deftag 22 1.4.2

 %global rolename23 rhc
-%deftag 23 1.1.3
+%deftag 23 1.6.0

 %global rolename24 journald
-%deftag 24 1.0.0
+%deftag 24 1.2.3
+
+%global rolename25 postgresql
+%deftag 25 1.3.5
+
+%global rolename26 systemd
+%deftag 26 1.1.2
+
+%global rolename27 keylime_server
+%deftag 27 1.1.2
+
+%global rolename28 fapolicyd
+%deftag 28 1.1.1
+
+%global rolename29 bootloader
+%deftag 29 1.0.3
+
+%global rolename30 snapshot
+%deftag 30 1.3.1

 Source1: %{archiveurl1}
 Source2: %{archiveurl2}
@ -209,32 +201,45 @@ Source21: %{archiveurl21}
 Source22: %{archiveurl22}
 Source23: %{archiveurl23}
 Source24: %{archiveurl24}
+Source25: %{archiveurl25}
+Source26: %{archiveurl26}
+Source27: %{archiveurl27}
+Source28: %{archiveurl28}
+Source29: %{archiveurl29}
+Source30: %{archiveurl30}
 # END AUTOGENERATED SOURCES

 # Includes with definitions/tags that differ between RHEL and Fedora
-Source2301: redhat_subscription.py
 Source1001: extrasources.inc

 %include %{SOURCE1001}

+# Includes with ansible_collection_build/_install that differ between RHEL versions
+Source1002: ansible-packaging.inc
+
+%include %{SOURCE1002}
+
+Source1003: vendoring-prep.inc
+Source1004: vendoring-build.inc
+
 Source995: CHANGELOG.md

 BuildArch: noarch
-
-%if %{with html}
-# Requirements for md2html.sh to build the documentation
-%if 0%{?fedora} || 0%{?rhel} >= 9
-BuildRequires: rubygem-kramdown-parser-gfm
-%else
-BuildRequires: pandoc
-BuildRequires: asciidoc
-BuildRequires: highlight
-%endif
-%endif
+# there is no ansible on i686, so when we get a builder that uses
+# this arch, the build fails with
+# No matching package to install: 'ansible-core >= 2.11.0'
+# unfortunately, this causes the src rpm build tasks to be reported
+# with the arch of the builder :-( which causes problems with internal
+# test infrastructure - while we get those issues sorted out, revert
+# this change - this means that centpkg builds may fail and may have
+# to be retried
+# ExcludeArch: i686

 # Requirements for galaxy_transform.py
 BuildRequires: python3
 BuildRequires: python%{python3_pkgversion}-ruamel-yaml
+# Requirements for release_collection.py
+BuildRequires: python3-setuptools

 # We must put %%description within the if block to avoid empty lines showing up.
 %if 0%{?rhel}
@ -276,23 +281,11 @@ 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 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 -n %{getarchivedir 0}
 # END AUTOGENERATED SETUP

-%if 0%{?rhel}
-# Untar vendored collection tarballs to corresponding directories
-for file in %{SOURCE801} %{SOURCE901} %{SOURCE902}; do
-    if [[ "$(basename $file)" =~ ([^-]+)-([^-]+)-(.+).tar.gz ]]; then
-        ns=${BASH_REMATCH[1]}
-        name=${BASH_REMATCH[2]}
-        ver=${BASH_REMATCH[3]}
-        mkdir -p .external/$ns/$name
-        pushd .external/$ns/$name > /dev/null
-        tar xfz "$file"
-        popd > /dev/null
-    fi
-done
-%endif
+# vendoring prep steps, if any
+%include %{SOURCE1003}

 declare -A ROLESTODIR=(%{rolestodir})
 for rolename in %{rolenames}; do
@ -307,6 +300,8 @@ for rolename in %{rolenames}; do
        fi
    fi
    mv "$dir_from_archive" ${rolename}
+    # Move a hidden .README.html to a not hidden README.html
+    mv $rolename/.README.html $rolename/README.html
 done

 %if 0%{?rhel}
@ -320,11 +315,12 @@ cd ../..

 cd %{rolename15}
 find -P tests examples -name \*.yml | while read file; do
-  sed -r -i -e "s/ansible-sshd/linux-system-roles.sshd/" \
+  sed -r -i -e "s/willshersystems:ansible-sshd/system_role:sshd/" \
+     -e "s/ansible-sshd/linux-system-roles.sshd/" \
     -e "s/ willshersystems.sshd/ linux-system-roles.sshd/" "$file"
 done
-sed -r -i -e "s/ willshersystems.sshd/ linux-system-roles.sshd/" README.md
-sed -r -i -e "s/min_ansible_version: 2.8/min_ansible_version: 2.9/" meta/main.yml
+sed -r -i -e "s/ willshersystems.sshd/ linux-system-roles.sshd/" README.md README.html
+sed -r -i -e 's/min_ansible_version: 2.8/min_ansible_version: "2.9"/' meta/main.yml
 cd ..

 cd %{rolename7}
@ -340,110 +336,8 @@ if [ "$rolesdir" != "$realrolesdir" ]; then
 fi
 cd ..

-%if 0%{?rhel}
-# Unpack tar.gz to retrieve to be vendored modules and place them in the roles library.
-# ansible.posix:
-#   - library:
-#     - Module selinux and seboolean for the selinux role
-#     - Module mount for the storage role
-declare -A module_map=( ["selinux.py"]="selinux" ["seboolean.py"]="selinux" ["mount.py"]="storage" )
-for module in "${!module_map[@]}"; do
-  role="${module_map[${module}]}"
-  if [ ! -d $role/library ]; then
-    mkdir $role/library
-  fi
-  cp -pL .external/ansible/posix/plugins/modules/$module $role/library/$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/' -e "s/ansible_collections.ansible.posix.plugins.module_utils/ansible.module_utils.${role}_lsr/" $role/library/$module
-done
-
-# ansible.posix:
-#   - module_utils:
-#     - Module_util mount for the storage role
-module_map=( ["mount.py"]="storage" )
-for module in "${!module_map[@]}"; do
-  role="${module_map[${module}]}"
-  if [ ! -d $role/module_utils/${role}_lsr ]; then
-    mkdir -p $role/module_utils/${role}_lsr
-  fi
-  cp -pL .external/ansible/posix/plugins/module_utils/$module $role/module_utils/${role}_lsr/$module
-done
-
-# community.general:
-#   - library:
-#     - Module seport, sefcontext and selogin for the selinux role rolename2
-#     - Module ini_file for role tlog
-#     - rhc modules
-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
-    mkdir $role/library
-  fi
-  # version 5.x seems to be broken?
-  moduledir=.external/community/general/plugins/modules
-  if [ ! -f $moduledir/$module ]; then
-    moduledir=.external/community/general/plugins/modules/system
-  fi
-  if [ ! -f $moduledir/$module ]; then
-    moduledir=.external/community/general/plugins/modules/files
-  fi
-  cp -pL $moduledir/$module $role/library/$module
-  ls -alrtF $role/library/$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/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
-module_map=( ["podman_container_info.py"]="podman" ["podman_image.py"]="podman" ["podman_play.py"]="podman" )
-for module in "${!module_map[@]}"; do
-  role="${module_map[${module}]}"
-  if [ ! -d $role/library ]; then
-    mkdir $role/library
-  fi
-  moduledir=.external/containers/podman/plugins/modules
-  cp -pL $moduledir/$module $role/library/$module
-  ls -alrtF $role/library/$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/' \
-    -e "s/ansible_collections.containers.podman.plugins.module_utils.podman/ansible.module_utils.${role}_lsr/" \
-    $role/library/$module
-done
-
-# containers.podman:
-#   - module_utils:
-#     - Module_util common for the podman role
-module_map=( ["common.py"]="podman" )
-for module in "${!module_map[@]}"; do
-  role="${module_map[${module}]}"
-  if [ ! -d $role/module_utils/${role}_lsr ]; then
-    mkdir -p $role/module_utils/${role}_lsr
-  fi
-  cp -pL .external/containers/podman/plugins/module_utils/podman/$module $role/module_utils/${role}_lsr/$module
-done
-
-# remove the temporary .external directory after vendoring
-rm -rf .external
-
-# Replacing "linux-system-roles.rolename" with "rhel-system-roles.rolename" in each role
-# Replacing "fedora.linux_system_roles." with "redhat.rhel_system_roles" in each role
-# This is for the "roles calling other roles" case
-# for podman, change the FQCN - using a non-FQCN module name doesn't seem to work,
-# even for the legacy role format
-# replace community.general for rhc
-for rolename in %{rolenames}; do
-    find $rolename -type f -exec \
-         sed -e "s/linux-system-roles[.]${rolename}\\>/%{roleinstprefix}${rolename}/g" \
-             -e "s/fedora[.]linux_system_roles[.]/%{collection_namespace}.%{collection_name}./g" \
-             -e "s/containers[.]podman[.]/%{collection_namespace}.%{collection_name}./g" \
-             -e "s/community[.]general[.]/%{collection_namespace}.%{collection_name}./g" \
-             -i {} \;
-done
-%endif
+# vendoring build steps, if any
+%include %{SOURCE1004}

 # Removing symlinks in tests/roles
 for rolename in %{rolenames}; do
@ -465,29 +359,67 @@ rm %{rolename5}/tests/ensure_provider_tests.py
 # Drop storage tests/scripts
 rm -rf %{rolename6}/tests/scripts

+# fix system_roles fingerprint in "external" roles
+python3 lsr_fingerprint.py
+
 # transform ambiguous #!/usr/bin/env python shebangs to python3 to stop brp-mangle-shebangs complaining
 find -type f -executable -name '*.py' -exec \
     sed -i -r -e '1s@^(#! */usr/bin/env python)(\s|$)@#\13\2@' '{}' +

 %build
-%if %{with html}
-readmes=""
-for role in %{rolenames}; do
-    readmes="${readmes} $role/README.md"
-done
-sh md2html.sh $readmes
-%endif
+# remove upstream-only documentation - for example, documentation
+# about collection dependencies is not needed in Fedora and EL RPMs
+# since the dependencies are already provided
+sed -e '/# Requirements/,/^#/s/^See below$/None/' \
+    -e '/# Collection requirements/,/^#/ {/# Collection requirements/d;/^#/!d}' \
+    -i */README.md
+sed -e '/id="requirements">Requirements<\/h/,/^<h/s/See below/None/' \
+    -e '/id="collection-requirements">/,/^<h/ {/id="collection-requirements">/d;/^<h/!d}' \
+    -i */README.html

-mkdir .collections
+for role in %{rolenames}; do
+    # awk: Remove collection-requirements from README.html TOC
+    # 1. If match found, add the line and -2,+1 lines' line number in an array "d".
+    # 2. Save all lines in an array with line number as index
+    # 3. Print only those index not in array "d"
+    awk '/id="toc-collection-requirements">/{for(x=NR-2;x<=NR+1;x++)d[x];} \
+        {a[NR]=$0} \
+        END{for(i=1;i<=NR;i++)if(!(i in d))print a[i]}' \
+        $role/README.html > $role/README.html.tmp
+    mv $role/README.html.tmp $role/README.html
+done
+
+# sshd README is not in the same format
+sed -e '/# Optional requirements/,/# Role variables/ {/# Optional/d;/# Role variables/!d}' \
+    -i sshd/README.md
+sed -e '/id="optional-requirements">/,/^<h/ {/id="optional-requirements">/d;/^<h/!d}' \
+    -i sshd/README.html
+# Remove optional-requirements from README.html TOC
+awk '/id="toc-optional-requirements">/{for(x=NR-2;x<=NR+1;x++)d[x];} \
+    {a[NR]=$0} \
+    END{for(i=1;i<=NR;i++)if(!(i in d))print a[i]}' \
+    sshd/README.html > sshd/README.html.tml
+mv sshd/README.html.tml sshd/README.html
+
+matchstr="actions/workflows/"
+for role in %{rolenames}; do
+    # in the first 14 lines of README.md, remove any line that looks like a
+    # github action badge. README.html doesn't have these lines.
+    sed -e "1,14 {\\,${matchstr},d; /\!\[/d}" -i $role/README.md
+done
+
+if [ ! -d %{collection_dest_path} ]; then
+  mkdir %{collection_dest_path}
+fi
 %if 0%{?rhel}
 # Convert the upstream collection readme to the downstream one
 %{SOURCE998} lsr_role2collection/collection_readme.md
-./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" \
+%{python3} ./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" \
                      "Red Hat Enterprise Linux System Roles Ansible Collection" \
                      "https://linux-system-roles.github.io" \
                      "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/administration_and_configuration_tasks_using_system_roles_in_rhel" \
                      "https://access.redhat.com/articles/3050101" \
-                      "https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%208&component=rhel-system-roles" \
+                      "https://issues.redhat.com/secure/CreateIssueDetails!init.jspa?pid=12332745&summary=Your%20request%20summary&issuetype=1&priority=10200&labels=Partner-Feature-Request&components=12380283" \
                      > galaxy.yml.tmp
 # we vendor-in all of the dependencies on rhel, so remove them
 rm -f lsr_role2collection/collection_requirements.txt
@ -515,39 +447,32 @@ extra_mapping="--extra-mapping fedora.linux_system_roles:%{collection_namespace}
 %else
 extra_mapping=""
 %endif
-LANG=C.utf-8 LC_ALL=C.utf-8 python3 release_collection.py --galaxy-yml galaxy.yml \
-    --src-path $(pwd) --dest-path $(pwd)/.collections $includes --force --no-update \
+LANG=C.utf-8 LC_ALL=C.utf-8 %{python3} release_collection.py --galaxy-yml galaxy.yml \
+    --src-path $(pwd) --dest-path $(pwd)/%{collection_dest_path} $includes --keep --no-update \
    --src-owner %{name} --skip-git --skip-check --skip-changelog $extra_mapping --debug

-# Remove table of contents from logging README.md
-# It is not needed for html and AH/Galaxy
-sed -i -e 's/^\(## Table of Contents\)/## Background\n\1/' \
-  .collections/ansible_collections/%{collection_namespace}/%{collection_name}/roles/logging/README.md
-sed -i -e '/^## Table of Contents/,/^## Background/d' \
-  .collections/ansible_collections/%{collection_namespace}/%{collection_name}/roles/logging/README.md
-
 # Remove internal links from readme files
 # They are not rendered properly on AH.
 for role in %{rolenames}; do
    sed -r -i -e 's/\[([^[]+)\]\(#[^)]+\)/\1/g' \
-    .collections/ansible_collections/%{collection_namespace}/%{collection_name}/roles/$role/README.md
+    %{collection_build_path}/roles/$role/README.md
 done

 # Remove test only collection dependencies
 # NOTE: These should not be in meta/collection-requirements.yml, they should be
 # in tests/collection-requirements.yml, but they can't be moved yet
 sed -i -e '/community[.]mysql:/d' -e '/community[.]postgresql:/d' \
-  .collections/ansible_collections/%{collection_namespace}/%{collection_name}/galaxy.yml
+  %{collection_build_path}/galaxy.yml

 cp %{SOURCE995} \
-    .collections/ansible_collections/%{collection_namespace}/%{collection_name}/docs/CHANGELOG.md
+    %{collection_build_path}/docs/CHANGELOG.md
 %if 0%{?rhel}
 cp %{SOURCE996} \
-    .collections/ansible_collections/%{collection_namespace}/%{collection_name}/CHANGELOG.rst
+    %{collection_build_path}/CHANGELOG.rst
 %endif

 # Build the collection
-pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
+pushd %{collection_build_path}
 %ansible_collection_build
 popd

@ -574,10 +499,8 @@ for role in %{rolenames}; do
       "%{buildroot}%{_pkgdocdir}/$role"
    ln -sr "%{buildroot}%{ansible_roles_dir}/%{roleinstprefix}$role/README.md" \
       "%{buildroot}%{_pkgdocdir}/$role"
-%if %{with html}
    ln -sr "%{buildroot}%{ansible_roles_dir}/%{roleinstprefix}$role/README.html" \
       "%{buildroot}%{_pkgdocdir}/$role"
-%endif
    if [ -f "%{buildroot}%{ansible_roles_dir}/%{roleinstprefix}$role/COPYING" ]; then
        ln -sr "%{buildroot}%{ansible_roles_dir}/%{roleinstprefix}$role/COPYING" \
           "%{buildroot}%{_pkglicensedir}/$role.COPYING"
@ -587,16 +510,20 @@ for role in %{rolenames}; do
           "%{buildroot}%{_pkglicensedir}/$role.LICENSE"
    fi
    if [ -d "%{buildroot}%{ansible_roles_dir}/%{roleinstprefix}$role/examples" ]; then
-        for file in "%{buildroot}%{ansible_roles_dir}/%{roleinstprefix}$role/examples/"*.yml ; do
-            basename=$(basename "$file" .yml)
-            newname="$basename"
-            if [[ "$newname" != example-* ]]; then
-                newname="example-$newname"
+        for file in "%{buildroot}%{ansible_roles_dir}/%{roleinstprefix}$role/examples/"* ; do
+            if [[ "$file" == *.yml ]]; then
+                basename=$(basename "$file" .yml)
+                newname="$basename"
+                if [[ "$newname" != example-* ]]; then
+                    newname="example-$newname"
+                fi
+                if [[ "$newname" != *-playbook ]]; then
+                    newname="${newname}-playbook"
+                fi
+                cp "$file" "%{buildroot}%{_pkgdocdir}/$role/${newname}.yml"
+            else
+                cp "$file" "%{buildroot}%{_pkgdocdir}/$role"
            fi
-            if [[ "$newname" != *-playbook ]]; then
-                newname="${newname}-playbook"
-            fi
-            cp "$file" "%{buildroot}%{_pkgdocdir}/$role/${newname}.yml"
            rm "$file"
        done
        if [ -f "%{buildroot}%{ansible_roles_dir}/%{roleinstprefix}$role/examples/inventory" ]; then
@ -610,10 +537,16 @@ for role in %{rolenames}; do
    fi
 done

-rm %{buildroot}%{ansible_roles_dir}/%{roleinstprefix}*/semaphore
+rm -f %{buildroot}%{ansible_roles_dir}/%{roleinstprefix}*/semaphore
 rm -r %{buildroot}%{ansible_roles_dir}/%{roleinstprefix}*/molecule

-rm -r %{buildroot}%{ansible_roles_dir}/%{roleinstprefix}*/.[A-Za-z]*
+# remove .dot files/directories, but keep the .ostree directory
+for item in %{buildroot}%{ansible_roles_dir}/%{roleinstprefix}*/.[A-Za-z]*; do
+    if [ "$(basename "$item")" = .ostree ]; then
+        continue
+    fi
+    rm -r "$item"
+done
 rm %{buildroot}%{ansible_roles_dir}/%{roleinstprefix}*/tests/.git*

 # NOTE: sshd/examples/example-root-login.yml is
@ -621,7 +554,7 @@ rm %{buildroot}%{ansible_roles_dir}/%{roleinstprefix}*/tests/.git*
 # must be updated if changing the file path

 # Install the collection
-pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
+pushd %{collection_build_path}
 %ansible_collection_install
 popd

@ -632,7 +565,7 @@ ln -sr %{buildroot}%{ansible_collection_files}%{collection_name}/README.md \
   %{buildroot}%{_pkgdocdir}/collection

 for rolename in %{rolenames}; do
-  for file in CHANGELOG.md README.md; do
+  for file in CHANGELOG.md README.md README.html; do
    if [ -f %{buildroot}%{ansible_collection_files}%{collection_name}/roles/${rolename}/$file ]; then
      if [ ! -d %{buildroot}%{_pkgdocdir}/collection/roles/${rolename} ]; then
        mkdir -p %{buildroot}%{_pkgdocdir}/collection/roles/${rolename}
@ -643,20 +576,11 @@ for rolename in %{rolenames}; do
  done
 done

-%if %{with html}
-# converting README.md to README.html for collection in %%{buildroot}%%{_pkgdocdir}/collection
-readmes="%{buildroot}%{_pkgdocdir}/collection/README.md"
-for role in %{rolenames}; do
-    readmes="${readmes} %{buildroot}%{_pkgdocdir}/collection/roles/${role}/README.md"
-done
-sh md2html.sh $readmes
-%endif
-
 %if %{with collection_artifact}
 # Copy collection artifact to /usr/share/ansible/collections/ for collection-artifact
-pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
-    mv %{collection_namespace}-%{collection_name}-%{version}.tar.gz \
-       %{buildroot}%{_datadir}/ansible/collections/
+pushd %{collection_build_path}
+mv %{collection_namespace}-%{collection_name}-%{version}.tar.gz \
+   %{buildroot}%{_datadir}/ansible/collections/
 popd
 %endif

@ -753,9 +677,256 @@ 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
+* Mon Feb 26 2024 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.21
+- Resolves: RHEL-3241 : bootloader - Create bootloader role (MVP)
+  fix issue with path on arches other than x86_64, and EFI systems
+- Resolves: RHEL-15872 : RHEL for Edge support in system roles
+  cockpit - fixed issue with test cleanup
+  postgresql - fixed issue with test cleanup
+
+* Wed Feb 21 2024 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.20
+- Resolves: RHEL-16965 : rhc - new rhc_insights.display_name parameter
+- Resolves: RHEL-16553 : snapshot - New Role for storage snapshot management (lvm, etc.)
+  fixes error handling
+
+* Tue Feb 20 2024 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.19
+- Resolves: RHEL-16553 : snapshot - New Role for storage snapshot management (lvm, etc.)
+  fixes idempotency, check mode, cleanup, basic-smoke-test
+
+* Tue Feb 20 2024 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.18
+- Resolves: RHEL-22229 : podman - user linger needed before secrets
+  fixed issue with ANSIBLE_GATHERING=explicit
+- Resolves: RHEL-5985 ansible-sshd - Manage SSH certificates
+  fixed issue with RHEL7 tests
+
+* Thu Feb 15 2024 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.17
+- Resolves: RHEL-25509 : nbde_server - fix: Allow tangd socket override directory to be managed outside of the role
+- Resolves: RHEL-21491 : network - Add blackhole type route to rhel-system-roles.network
+- Fixed issues with ANSIBLE_GATHERING=explicit in several roles
+- Fixed test cleanup issues in several roles
+
+* Tue Feb 13 2024 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.16
+- Resolves: RHEL-16553 : snapshot - New Role for storage snapshot management (lvm, etc.)
+  this is the MVP candidate for the snapshot role
+
+* Mon Feb 12 2024 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.15
+- Resolves: RHEL-22108 : ha_cluster - Setting cluster members' attributes
+
+* Sun Feb 11 2024 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.14
+- Resolves: RHEL-3241 : bootloader - Create bootloader role (MVP)
+- Resolves: RHEL-21400 : postgresql - PostgreSQL system role: unable to install PostgreSQL version 15 on RHEL 9
+
+* Fri Feb 9 2024 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.13
+- Resolves: RHEL-16975 : rhc - rhc: new rhc_insights.ansible_host parameter
+  Rename test playbook from .yaml to .yml
+
+* Thu Feb 8 2024 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.12
+- Resolves: RHEL-22229 : podman - user linger needed before secrets
+
+* Wed Jan 31 2024 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.11
+- Resolves: RHEL-21400 : postgresql - PostgreSQL system role: unable to install PostgreSQL version 15 on RHEL 9
+- Resolves: RHEL-23309 : storage - tests_lvm_auto_size_cap_nvme_generated failed at "Assert expected size is actual size"
+
+* Sat Jan 27 2024 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.10
+- Resolves: RHEL-14022 : storage - Basic support for creating shared logical volumes
+  GFS2 support in blivet is enabled
+
+* Fri Jan 26 2024 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.9
+- Resolves: RHEL-21383 : ad_integration - feat: add ad_integration_preserve_authselect_profile
+- Resolves: RHEL-21134 : ad_integration - feat: Add SSSD parameters support
+- Resolves: RHEL-21123 : journald - feat: Add support for ForwardToSyslog
+- Resolves: RHEL-22310 : podman - fix: cast secret data to string in order to allow JSON valued strings
+- Resolves: RHEL-21402 : podman - fix: name of volume quadlet service should be basename-volume.service
+- Resolves: RHEL-21400 : postgresql - PostgreSQL system role: unable to install PostgreSQL version 15 on RHEL 9
+- Resolves: RHEL-16975 : rhc - rhc: new rhc_insights.ansible_host parameter
+
+* Wed Jan 24 2024 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.8
+- Resolves: RHEL-16553 : snapshot - New Role for storage snapshot management (lvm, etc.)
+
+* Fri Jan 19 2024 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.7
+- Add ExcludeArch i686 to fix build issues with ansible-core
+- Resolves: RHEL-21946 : keylime_server - won't detect registrar start failure
+
+* Thu Jan 18 2024 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.6
+- Resolves: RHEL-21537 : storage - lvmlockd process is not running - test only
+
+* Mon Jan 15 2024 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.5
+- Resolves: RHEL-3241 : bootloader - Create bootloader role (MVP)
+
+* Tue Dec 12 2023 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.4
+- Resolves: RHEL-15872 : RHEL for Edge support in system roles
+  updated several roles with ostree improvements
+  metrics role support for ostree
+- Resolves: RHEL-16542 : fapolicyd - feat: Import code for fapolicyd system role
+  several role improvements
+- Resolves: RHEL-4684 : ha_cluster - fix: set sbd.service timeout based on SBD_START_DELAY
+- Resolves: RHEL-19047 : logging - fix: avoid conf of RatelimitBurst when RatelimitInterval is zero
+- Resolves: RHEL-18170 : metrics - [RFE] Metrics system role support for configuring PMIE webhooks
+- Resolves: RHEL-19242 : podman - fix: add no_log: true for tasks that can log secret data
+- Resolves: RHEL-18963 : postgresql - feat: enable using postgresql 16
+- Resolves: RHEL-16977 : rhc - rhc: support RHEL 7 managed nodes
+- Resolves: RHEL-19042 : selinux - fix: no longer use "item" as a loop variable
+- Resolves: RHEL-19044 : selinux - fix: Print an error message when module to be created doesn't exist
+- Resolves: RHEL-14022 : storage - Basic support for creating shared logical volumes
+
+* Fri Dec 1 2023 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.3
+- Resolves: RHEL-17874 : ha_cluster - high-availability firewall service is not added on qdevice node
+
+* Thu Nov 30 2023 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.2
+- Resolves: RHEL-15872 : RHEL for Edge support in system roles
+  vpn - fixed issue with test cleanup
+
+* Thu Nov 30 2023 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.1
+- Resolves: RHEL-15872 :  - RHEL for Edge support in system roles
+  except for nbde_client, rhc, metrics
+- Resolves: RHEL-17667 : ad_integration - feat: Add sssd custom settings
+- Resolves: RHEL-16542 : fapolicyd - feat: Import code for fapolicyd system role
+- Resolves: RHEL-14090 : ha_cluster - [RFE] HA Cluster system role should be able to enable Resilient Storage repository
+- Resolves: RHEL-4624 : ha_cluster - [FutureFeature] Allow ha_cluster role to configure fencing topology
+- Resolves: RHEL-3264 : ha_cluster - [FutureFeature] Allow ha_cluster role to configure all qdevice options
+- Resolves: RHEL-3354 : kdump - fix: retry read of kexec_crash_size
+- Resolves: RHEL-15933 : logging - feat: Add support for the global config option preserveFQDN with a new logg…
+- Resolves: RHEL-15440 : logging - feat: Add support for general queue and general action parameters
+- Resolves: RHEL-15038 : logging - fix: check that logging_max_message_size is set, not rsyslog_max_message_size
+- Resolves: RHEL-16501 : network - Ansible RHEL network system role issue with ipv6.routing-rules the prefix length for 'from' cannot be zero"
+- Resolves: RHEL-15871 : selinux - fix: Use `ignore_selinux_state` module option
+- Resolves: RHEL-16213 : storage - feat: Support for creating volumes without a FS
+
+* Thu Nov 9 2023 Sergei Petrosian <spetrosi@redhat.com> - 1.23.0-2
+- RHEL-1119: ad_integration: Support for dynamic DNS Updates
+  Update to a new version with fixed tests
+
+* Wed Sep 20 2023 Sergei Petrosian <spetrosi@redhat.com> - 1.23.0-1
+- Resolves: RHEL-5345 spec - Remove with_html, instead use built-in .README.html
+- Resolves: RHEL-5985 ansible-sshd - Manage SSH certificates
+- rhbz#2224648: Remove ad_integration patch and use the latest ad_integration
+  version instead. Vendor community-general.ini_files for
+- RHEL-1119: ad_integration: Support for dynamic DNS Updates
+- Change link to open new issue in galaxy.yml from deprecated BZ to Jira
+
+* Tue Aug 15 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-1
+- Resolves:rhbz#2233183 : ad_integration - red hat "rhel system role" ad_integration leaks credentials when in check_mode
+- Resolves:rhbz#2232391 : kdump - role: "Write new authorized_keys if needed" task idempotency issues
+- Resolves:rhbz#2232392 : kdump - system role fails if kdump_ssh_user doesn't have a .ssh/authorized_keys file in home directory
+- Resolves RHEL-1398 : kdump - fix: ensure .ssh directory exists for kdump_ssh_user on kdump_ssh_server
+- Resolves RHEL-1500 : kdump - fix: Ensure authorized_keys management works with multiple hosts
+- Resolves:rhbz#2224648 : firewall - fix: reload on resetting to defaults
+- Resolves RHEL-1496 : firewall - fix: files: overwrite firewalld.conf on previous replaced
+- Resolves RHEL-1498 : storage - fix: use stat.pw_name, stat.gr_name instead of owner, group
+  sshd README remove upstream only docs
+  first RC for 1.22.0 rhel 8.9 and 9.3
+  fix firewall reload test gather facts
+
+* Thu Aug 10 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-0.21
+- Resolves:rhbz#2220962 : podman - support quadlet units
+  support for rootless quadlets, secrets
+
+* Wed Aug 09 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-0.20
+- Resolves:rhbz#2140880 : firewall - missing module in linux-system-roles.firewall to create an ipset
+
+* Tue Aug 01 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-0.19
+- Resolves RHEL-866 : podman - use getsubids to look for subuid, subgid for IdM support
+- Resolves RHEL-858 : podman - allow to not pull images, continue if image pull fails
+- Resolves:rhbz#2224648 : firewall - fix: reload on resetting to defaults
+- Resolves:rhbz#2226077 : podman - Podman system role:  Unable to use podman_registries_conf to set unqualified-search-registries
+- Resolves RHEL-918 : firewall - Ansible RHEL firewall system role not idempotent when configuring the interface using the role in rhel9
+- Resolves RHEL-907 : kdump - use failure_action instead of default on EL9 and later
+- Resolves RHEL-899 : firewall - Check mode fails with replacing previous rules
+- Resolves:rhbz#2227823 : rhc - baseurl in rhsm.conf is empty when rhc_baseurl is not specified
+
+* Wed Jul 26 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-0.18
+- Resolves:rhbz#2224388 : systemd - system role for managing systemd units
+
+* Tue Jul 25 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-0.17
+- Resolves:rhbz#2224387 : keylime_server - system role for managing keylime servers
+
+* Fri Jul 21 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-0.16
+- Resolves:rhbz#2220963 : podman - allow container networking configuration
+- Resolves:rhbz#2220961 : podman - support for healthchecks and healthcheck actions
+- Resolves:rhbz#2220962 : podman - support quadlet units
+- Resolves:rhbz#2224388 : systemd - system role for managing systemd units
+- Resolves:rhbz#2223036 : ALL - facts being gathered unnecessarily
+- Resolves:rhbz#2186057 : certificate - rhel-system-roles.certificate does not re-issue after updating key_size
+- Resolves:rhbz#2222433 : firewall - Check mode fails when creating new firewall service
+- Resolves:rhbz#2222809 : firewall - should have option to disable conflicting services
+- Resolves:rhbz#2222808 : firewall - when firewalld.service is masked, firewall role fails
+- Resolves:rhbz#2224094 : storage - RAID volume pre cleanup - remove existing data from member disks as needed before creation
+
+* Mon Jul 10 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-0.15
+- Resolves:rhbz#2218204 : certificate - add mode parameter to change permissions for cert files
+- Resolves:rhbz#2218595 : network - Support no-aaaa DNS option
+
+* Sun Jul 09 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-0.14
+- Resolves:rhbz#2218899 : storage - [RHEL8] Unexpected behavior when creating ext4 filesystem with invalid parameter
+
+* Fri Jun 23 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-0.13
+- Resolves:rhbz#2216759 : ssh - add ssh_backup option with default true
+- Resolves:rhbz#2216521 : firewall - Don't install python(3)-firewall it's a dependency of firewalld
+
+* Thu Jun 22 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-0.12
+- Resolves:rhbz#2168738 : storage - Storage: mounted devices that are in use cannot be resized
+
+* Tue Jun 20 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-0.11
+- Resolves:rhbz#2211272 : kdump - support auto_reset_crashkernel, dracut_args, deprecate /etc/sysconfig/kdump
+
+* Wed Jun 07 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-0.10
+- Resolves:rhbz#2211723 : ad_integration - add ad_integration_force_rejoin
+
+* Tue Jun 06 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-0.9
+- Resolves:rhbz#2211273 : network - Support configuring auto-dns setting
+- Resolves:rhbz#2211778 : rhc - implement rhc_proxy.scheme
+- Resolves:rhbz#2141961 : storage - RFE for the storage system role to support configuring the stripe size for RAID LVM volumes
+- Resolves:rhbz#2211271 : selinux - use restorecon -T 0 on supported platforms
+- Resolves:rhbz#2211247 : storage - Failed to commit changes to disk: Failed to format device: Input/output error
+
+* Tue May 30 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-0.8
+- Resolves:rhbz#2181661 : storage - [RFE] user-specified mount point owner and permissions
+- Resolves:rhbz#2193057 : storage - Cannot set chunk size for RAID: Unsupported parameters for (blivet) module: pools.raid_chunk_size
+- Resolves:rhbz#2211247 : storage - Failed to commit changes to disk: Failed to format device: Input/output error
+
+* Tue May 23 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-0.7
+- remove upstream only docs from README.md files
+- python3-setuptools is now required for release_collection.py
+- fix ruamel issue described at https://github.com/linux-system-roles/auto-maintenance/pull/272
+- Resolves:rhbz#2209441 : rhc - system role does not apply Insights tags
+- Resolves:rhbz#2191702 : tlog - use the proxy provider - the files provider is deprecated in sssd
+- Resolves:rhbz#2190500 : roles should support running with gather_facts: false
+- READMEs for all roles contain only downstream applicable docs
+- All roles/tests now work with ansible-core 2.15
+- Fix some roles to work with remove-cloud-init
+
+* Thu May 04 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-0.6
+- Resolves:rhbz#2186910 : fingerprint in config files managed by roles
+- Resolves:rhbz#2190478 : ha_cluster - Add possibility to load SBD watchdog kernel modules
+- Resolves:rhbz#2190483 : ha_cluster - support for resource and operation defaults
+- Resolves:rhbz#2151371 : postgresql - [RFE] system role for PostgreSQL management
+- Resolves:rhbz#2179016 : rhc - [RFE] New role for Red Hat subscription management, insights management [rhel-8.9.0]
+- Resolves:rhbz#2190480 : ha_cluster - use pcs to setup qdevice certificates if available
+- Resolves:rhbz#2186198 : spec: Remove doc fragments from vendored modules
+- Resolves:rhbz#2190500 : roles should support running with gather_facts: false
+- Resolves:rhbz#2175326 : use ansible-galaxy collection build/install instead of tar
+- Resolves:rhbz#2186908 : rhc - RHC system role: activation key registration fails if system is already registered
+- Resolves:rhbz#2190499 : selinux - failing test - sshd/tests_firewall_selinux.yml - No package matching 'firewalld' found available, installed or updated
+
+* Wed May  3 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-0.5
+- fix issue with postgresql tests
+
+* Tue May  2 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-0.4
+- fix issue with ha_cluster vendoring modprobe
+- move vendoring into included files
+
+* Thu Apr 27 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-0.3
+- fix issues in some tests with ANSIBLE_GATHERING=explicit
+- add testing for fingerprints in config files
+- fix podman jinja 2.7 issue
+- sshd - skip firewall testing if not supported
+
+* Thu Apr 6 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-0.2
+- initial 8.9/9.3
+
+* Thu Apr 6 2023 Sergei Petrosian <spetrosi@redhat.com> - 1.21.1-2
+- Resolves: rhbz#2185002 : Remove doc fragments from vendored modules
+- Build collection artifact in the same directory on Fedora and RHEL

 * Thu Mar 16 2023 Rich Megginson <rmeggins@redhat.com> - 1.21.1-1
 - Resolves:rhbz#2144877 : rhc - new role for subscription management/registration/insights