import CS rhel-system-roles-1.88.9-0.1.el9

2024-09-30 15:10:30 +00:00 · 2024-09-30 15:10:30 +00:00 · 4937c72890
commit 4937c72890
parent f2a4888fa6
6 changed files with 388 additions and 130 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,34 +1,36 @@
-SOURCES/ad_integration-1.4.2.tar.gz
+SOURCES/ad_integration-1.4.6.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
+SOURCES/ansible-sshd-v0.25.0.tar.gz
+SOURCES/auto-maintenance-1.88.9.tar.gz
+SOURCES/bootloader-1.0.7.tar.gz
+SOURCES/certificate-1.3.6.tar.gz
+SOURCES/cockpit-1.5.10.tar.gz
+SOURCES/community-general-9.3.0.tar.gz
+SOURCES/containers-podman-1.15.4.tar.gz
+SOURCES/crypto_policies-1.4.0.tar.gz
+SOURCES/fapolicyd-1.1.7.tar.gz
+SOURCES/firewall-1.8.0.tar.gz
+SOURCES/gfs2-1.0.0.tar.gz
+SOURCES/ha_cluster-1.19.2.tar.gz
+SOURCES/journald-1.3.3.tar.gz
+SOURCES/kdump-1.4.7.tar.gz
+SOURCES/kernel_settings-1.3.2.tar.gz
+SOURCES/keylime_server-1.1.5.tar.gz
+SOURCES/logging-1.13.4.tar.gz
+SOURCES/metrics-1.10.6.tar.gz
+SOURCES/nbde_client-1.3.0.tar.gz
+SOURCES/nbde_server-1.4.7.tar.gz
+SOURCES/network-1.16.4.tar.gz
+SOURCES/podman-1.6.4.tar.gz
+SOURCES/postfix-1.5.1.tar.gz
+SOURCES/postgresql-1.3.8.tar.gz
+SOURCES/rhc-1.6.6.tar.gz
+SOURCES/selinux-1.8.0.tar.gz
+SOURCES/snapshot-1.4.1.tar.gz
+SOURCES/ssh-1.5.0.tar.gz
+SOURCES/storage-1.18.7.tar.gz
+SOURCES/sudo-1.1.0.tar.gz
+SOURCES/systemd-1.2.0.tar.gz
+SOURCES/timesync-1.9.0.tar.gz
+SOURCES/tlog-1.3.6.tar.gz
+SOURCES/vpn-1.6.6.tar.gz
--- a/.rhel-system-roles.metadata
+++ b/.rhel-system-roles.metadata
@ -1,34 +1,36 @@
-5141bc9c1084d08fc347e017bb1c91963bcbe441 SOURCES/ad_integration-1.4.2.tar.gz
+11b58e43e1b78cb75eda26724359f4d748173d5f SOURCES/ad_integration-1.4.6.tar.gz
 da646eb9ba655f1693cc950ecb5c24af39ee1af6 SOURCES/ansible-posix-1.5.4.tar.gz
-ae49d8b3f623a4bf132644f0f2256a92bd4c41ae SOURCES/ansible-sshd-v0.23.2.tar.gz
-e4df3548cf129b61c40b2d013917e07be2f3ba4e SOURCES/auto-maintenance-11ad785c9bb72611244e7909450ca4247e12db4d.tar.gz
-b84e7d8110638848b22a22c7ed8e94cf865a13d8 SOURCES/bootloader-1.0.3.tar.gz
-9eaac83b306b2fb8dd8e82bc4b03b30285d2024f SOURCES/certificate-1.3.3.tar.gz
-dd3d8b4b12aeeeab4cf78bfdad911a194027fc8e SOURCES/cockpit-1.5.5.tar.gz
-15fd2f2c08ae17cc47efb76bd14fb9ab6f33bc26 SOURCES/community-general-8.3.0.tar.gz
-ff961816d6e01326a413552b4f3c290ccdb9dc20 SOURCES/containers-podman-1.12.0.tar.gz
-6705818b1fdf3cc82083937265f7942e3d3ccc2d SOURCES/crypto_policies-1.3.2.tar.gz
-29505121f6798f527045c5f66656fd5c19bed5fe SOURCES/fapolicyd-1.1.1.tar.gz
-1a7a875cebbd3e146f6ca554269ee20845cf877b SOURCES/firewall-1.7.4.tar.gz
-53e8991ca7e0c5c97ab010e843bc1a7c4a98eb96 SOURCES/ha_cluster-1.14.0.tar.gz
-e96ba9f5b3ae08a12dbf072f118e316036553b94 SOURCES/journald-1.2.3.tar.gz
-de6c6103b7023aa21782906696e712b428600a92 SOURCES/kdump-1.4.4.tar.gz
-0f28a0919874f650ef0149409116bae12d2363e0 SOURCES/kernel_settings-1.2.2.tar.gz
-85c14c7e260b247eb7947c8706af82ff5aac07d2 SOURCES/keylime_server-1.1.2.tar.gz
-15e86d6989a25cd50edb58f5fb479e0d1ae3b755 SOURCES/logging-1.12.4.tar.gz
-e795238995d2dfb2cbdb5cc9bf4923f7410ac49a SOURCES/metrics-1.10.1.tar.gz
-8218c40eb96540e2f5d9f5be95deea9e2110ddd8 SOURCES/nbde_client-1.2.17.tar.gz
-dce6435ca145b3143c1326a8e413e8173e5655ef SOURCES/nbde_server-1.4.3.tar.gz
-e89a4d6974a089f035b1f3fc79a1f9cacfa1f933 SOURCES/network-1.15.1.tar.gz
-fc242b6f776088720ef04e5891c75fd33e6e1e96 SOURCES/podman-1.4.7.tar.gz
-ddb7e2a575e4b96666ce13dbdbaea97cc2f83954 SOURCES/postfix-1.4.3.tar.gz
-bf0f12e78bfc2120d85c5458aa7d53b15738e73c SOURCES/postgresql-1.3.5.tar.gz
-b519a4e35b55e97bf954916d77f1f1f82ec2615b SOURCES/rhc-1.6.0.tar.gz
-458b076a73a1c3597485b60bc734b225f3079a86 SOURCES/selinux-1.7.4.tar.gz
-8fdcd362f021d41165c4a959ba79136491389343 SOURCES/snapshot-1.3.1.tar.gz
-d2c153993e51ce949db861db2aa15e8ec90b45af SOURCES/ssh-1.3.2.tar.gz
-e08c1df6c6842f6ad37fff34d2e9d96e9cdddd70 SOURCES/storage-1.16.2.tar.gz
-df8f2896ad761da73872d17a0f0cd8cfd34e0671 SOURCES/systemd-1.1.2.tar.gz
-47be5d4b967970eefecf72a79a1d8d9bc7c72f18 SOURCES/timesync-1.8.2.tar.gz
-6d559dc44f44bc7e505602b36b51b4d1b60f2754 SOURCES/tlog-1.3.3.tar.gz
-27395883fa555658257e70287e709f8ccc1d8392 SOURCES/vpn-1.6.3.tar.gz
+5829f61d848d1fe52ecd1702c055eeed8ef56e70 SOURCES/ansible-sshd-v0.25.0.tar.gz
+56fbd9160cf34bbc1f251bfbe3dee5dcbf12cecc SOURCES/auto-maintenance-1.88.9.tar.gz
+7ae4b79529d14c0c8958cf9633f8d560d718f4e7 SOURCES/bootloader-1.0.7.tar.gz
+45ba484be2962e9fd70dbf09bb5e34a900e000cb SOURCES/certificate-1.3.6.tar.gz
+15677bec6ddafb75911d7c29fe1eb1c24b9b4f1c SOURCES/cockpit-1.5.10.tar.gz
+06964c4eefee9b942425e479324b781d88885e82 SOURCES/community-general-9.3.0.tar.gz
+2c0a98aedb2c031bfc94609bc9553d192224b159 SOURCES/containers-podman-1.15.4.tar.gz
+fbf7f7a452d72dc0f884947da98795082042782e SOURCES/crypto_policies-1.4.0.tar.gz
+5c0ecbe8246a0d8dde0930ef111f1c17a4976797 SOURCES/fapolicyd-1.1.7.tar.gz
+f4eb8ea59532a630408593594ded54cbd2eaf04f SOURCES/firewall-1.8.0.tar.gz
+cc1a45ba4a6a0b34186197599f02cbb437c5abbd SOURCES/gfs2-1.0.0.tar.gz
+8ecc501560bc115deeb72797dfb8a63b583a3a48 SOURCES/ha_cluster-1.19.2.tar.gz
+0541cf78ef043606ecb97fadc97046645c9f0857 SOURCES/journald-1.3.3.tar.gz
+4a61f3e6e5ed0ed6bcbb4ac400ecdce1ae3cd679 SOURCES/kdump-1.4.7.tar.gz
+75c64569c8b89435f8d0907e9c057ea142d86a4e SOURCES/kernel_settings-1.3.2.tar.gz
+7dc7288b26c73e19ed0b0a723cafd43e8bdf2be8 SOURCES/keylime_server-1.1.5.tar.gz
+4825923fc0fa29e80c08864b0afc50e2e075be91 SOURCES/logging-1.13.4.tar.gz
+b0b4b0af1872dc7bdd3c36e4ff40547a31cc4ed0 SOURCES/metrics-1.10.6.tar.gz
+544c5c9e53beef034b0d39ecf944e0bb13231535 SOURCES/nbde_client-1.3.0.tar.gz
+caa3786c527a633d42278cb0b1d0c4ae37506237 SOURCES/nbde_server-1.4.7.tar.gz
+d41648a85e772f0a69ec1726595e2c33fac1d2e2 SOURCES/network-1.16.4.tar.gz
+9c34efd3ec797a50e8eb47f8a559e537fde33f40 SOURCES/podman-1.6.4.tar.gz
+29bc04e0b7e231251360f86d9cbcaa6841d8a3ba SOURCES/postfix-1.5.1.tar.gz
+9bd35cfa10bc5a3eb9f467e6114ae6dcebb55a01 SOURCES/postgresql-1.3.8.tar.gz
+b6932d2f66bfba15257d3f6d23f02e028eaa0638 SOURCES/rhc-1.6.6.tar.gz
+9498596941d29a96c84e122e047f87e95788be7e SOURCES/selinux-1.8.0.tar.gz
+4dc75265463cbf83c9779c65bd177ed204300aee SOURCES/snapshot-1.4.1.tar.gz
+b6acf6754f53c7dfda709060a1730ab7ff6d2009 SOURCES/ssh-1.5.0.tar.gz
+0266534ede746114046b1158c61bccf8bc60d8e4 SOURCES/storage-1.18.7.tar.gz
+4e03fa316429b024931e09962827f89b2e345462 SOURCES/sudo-1.1.0.tar.gz
+b1e978dfed627fcdf885899416d239ee8a061fc8 SOURCES/systemd-1.2.0.tar.gz
+0a9df710ddd8a43e74cbd77e4414d5ea7e90d7b9 SOURCES/timesync-1.9.0.tar.gz
+789253ee36294f77dd8be3de42c973956dd86fbb SOURCES/tlog-1.3.6.tar.gz
+82e444fc7ed54b874f7b0b3c40e22b307b6c0924 SOURCES/vpn-1.6.6.tar.gz
--- a/SOURCES/CHANGELOG.md
+++ b/SOURCES/CHANGELOG.md
@ -1,5 +1,56 @@
 Changelog
 =========
+[1.88.9] - 2024-09-13
+
+### New Features
+
+- [bootloader - bootloader role tests do not work on ostree](https://issues.redhat.com/browse/RHEL-26714)
+- [gfs2 - add gfs2 system role](https://issues.redhat.com/browse/RHEL-34214)
+- [ha_cluster - [RFE] rhel_system_roles.ha_cluster - Utilization Support](https://issues.redhat.com/browse/RHEL-33532)
+- [ha_cluster - [RFE] ha_cluster_node_options allows per-node addresses and SBD options to be set](https://issues.redhat.com/browse/RHEL-30111)
+- [ha_cluster - [RFE] make it easier to install cloud agents](https://issues.redhat.com/browse/RHEL-27186)
+- [ha_cluster - [RFE] rhel_system_roles.ha_cluster - ACL Support](https://issues.redhat.com/browse/RHEL-17271)
+- [ha_cluster - alerts support](https://issues.redhat.com/browse/RHEL-49596)
+- [journald - feat: Add options for rate limit interval and burst](https://issues.redhat.com/browse/RHEL-30170)
+- [logging - RFE - system-roles - logging: Add truncate options for local file inputs](https://issues.redhat.com/browse/RHEL-46590)
+- [logging - redhat.rhel_system_roles.logging role fails to process logging_outputs: of type: "custom"](https://issues.redhat.com/browse/RHEL-40273)
+- [logging - [RFE] Add the umask settings or enable a variable in linux-system-roles.logging](https://issues.redhat.com/browse/RHEL-34935)
+- [nbde_client - feat: Allow initrd configuration to be skipped](https://issues.redhat.com/browse/RHEL-45717)
+- [network - support route src parameter](https://issues.redhat.com/browse/RHEL-3252)
+- [podman - feat: manage TLS cert/key files for registry connections and validate certs](https://issues.redhat.com/browse/RHEL-33547)
+- [podman - podman role should support default credentials and per-unit credentials](https://issues.redhat.com/browse/RHEL-30185)
+- [podman - podman role should support containers-auth.json](https://issues.redhat.com/browse/RHEL-30183)
+- [postfix - feat: Added postfix_files feature as a simple means to add extra files/maps to config](https://issues.redhat.com/browse/RHEL-46854)
+- [snapshot - feat: rewrite snapshot.py as an Ansible module / add support for thin origins](https://issues.redhat.com/browse/RHEL-48227)
+- [ssh - feat: Add new configuration options and remove false positives in the test](https://issues.redhat.com/browse/RHEL-40180)
+- [storage - [RFE] manage stratis](https://issues.redhat.com/browse/RHEL-31854)
+- [storage - [RHEL9][RFE] resize LVM PVs](https://issues.redhat.com/browse/RHEL-14862)
+- [storage - Fingerprint storage RHEL System Role managed config files](https://issues.redhat.com/browse/RHEL-30888)
+- [sudo - Add sudo system role](https://issues.redhat.com/browse/RHEL-37549)
+
+### Bug Fixes
+
+- [ - package rhel-system-roles.noarch does not provide docs for ansible-doc](https://issues.redhat.com/browse/RHEL-18075)
+- [ad_integration - fix: Sets domain name lower case in realmd.conf section header](https://issues.redhat.com/browse/RHEL-28658)
+- [bootloader - fix: Set user.cfg path to /boot/grub2/ on EL 9 UEFI](https://issues.redhat.com/browse/RHEL-39996)
+- [cockpit - cockpit install all wildcard match does not work in newer el9](https://issues.redhat.com/browse/RHEL-41090)
+- [ha_cluster - Fix inconsistent approach for multiple `attributes.attrs` in `ha_cluster_node_options`](https://issues.redhat.com/browse/RHEL-33076)
+- [ha_cluster - Fixes for new pcs and ansible](https://issues.redhat.com/browse/RHEL-55295)
+- [kernel_settings - fix: Use tuned files instead of using it as a module](https://issues.redhat.com/browse/RHEL-53896)
+- [logging - Setup imuxsock using rhel-system-roles.logging causing an error](https://issues.redhat.com/browse/RHEL-35561)
+- [network - Fix testing Failures due to connection.autoconnect-ports Unknown Property](https://issues.redhat.com/browse/RHEL-32872)
+- [network - Make sure that the network role CI is solid robust](https://issues.redhat.com/browse/RHEL-25264)
+- [podman - fix: proper cleanup for networks; ensure cleanup of resources](https://issues.redhat.com/browse/RHEL-50102)
+- [podman - fix: grab name of network to remove from quadlet file](https://issues.redhat.com/browse/RHEL-40761)
+- [podman - Create podman secret when skip_existing=True and it does not exist](https://issues.redhat.com/browse/RHEL-39438)
+- [podman - fix: do not use become for changing hostdir ownership, and expose subuid/subgid info](https://issues.redhat.com/browse/RHEL-32464)
+- [podman - fix: use correct user for cancel linger file name](https://issues.redhat.com/browse/RHEL-32382)
+- [podman - fails to configure and run containers with podman rootless using different username and groupname](https://issues.redhat.com/browse/RHEL-56626)
+- [rhc - fix: drop usage of "auto_attach" of the "redhat_subscription" module](https://issues.redhat.com/browse/RHEL-53902)
+- [sshd - second SSHD service broken](https://issues.redhat.com/browse/RHEL-29309)
+- [storage - [RHEL8 ] var unused_disks get different sector size disks   ](https://issues.redhat.com/browse/RHEL-25994)
+- [storage - rhel-system-role.storage is not idempotent](https://issues.redhat.com/browse/RHEL-25777)
+
 [1.23.0] - 2024-01-15
 ----------------------------

--- a/SOURCES/extrasources.inc
+++ b/SOURCES/extrasources.inc
@ -1,10 +1,10 @@
 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
+Source901: https://galaxy.ansible.com/download/community-general-9.3.0.tar.gz
+Source902: https://galaxy.ansible.com/download/containers-podman-1.15.4.tar.gz

 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
+Provides: bundled(ansible-collection(community.general)) = 9.3.0
+Provides: bundled(ansible-collection(containers.podman)) = 1.15.4

 Source996: CHANGELOG.rst
 Source998: collection_readme.sh
--- a/SOURCES/vendoring-build.inc
+++ b/SOURCES/vendoring-build.inc
@ -22,8 +22,37 @@ declare -A plugin_map=(
  [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
+  [containers/podman/plugins/module_utils/podman/quadlet.py]=podman
 )

+# fix the following issue
+# ERROR: Found 1 pylint issue(s) which need to be resolved:
+# ERROR: plugins/modules/rhsm_repository.py:263:8: wrong-collection-deprecated: Wrong collection name ('community.general') found in call to Display.deprecated or AnsibleModule.deprecate
+sed "s/collection_name='community.general'/collection_name='%{collection_namespace}.%{collection_name}'/" \
+  -i .external/community/general/plugins/modules/rhsm_repository.py
+
+fix_module_documentation() {
+  local module_src doc_fragment_name df_dest_dir
+  local -a paths
+  module_src=".external/$1"
+  sed ':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/' \
+    -i "$module_src"
+  # grab documentation fragments
+  for doc_fragment_name in $(awk -F'[ -]+' '/^extends_documentation_fragment:/ {reading = 1; next}; /^[ -]/ {if (reading) {print $2}; next}; /^[^ -]/ {if (reading) {exit}}' "$module_src"); do
+    if [ "$doc_fragment_name" = files ]; then continue; fi  # this one is built-in
+    df_dest_dir="%{collection_build_path}/plugins/doc_fragments"
+    if [ ! -d "$df_dest_dir" ]; then
+      mkdir -p "$df_dest_dir"
+    fi
+    paths=(${doc_fragment_name//./ })
+    # if we ever have two different collections that have the same doc_fragment name
+    # with different contents, we will be in trouble . . .
+    # will have to make the doc fragment files unique, then edit $dest to use
+    # the unique name
+    cp ".external/${paths[0]}/${paths[1]}/plugins/doc_fragments/${paths[2]}.py" "$df_dest_dir"
+  done
+}
+
 declare -a modules mod_utils collection_plugins
 declare -A dests
 # vendor in plugin files - fix documentation, fragments
@ -31,9 +60,12 @@ for src in "${!plugin_map[@]}"; do
  roles="${plugin_map["$src"]}"
  if [ "$roles" = __collection ]; then
    collection_plugins+=("$src")
+    case "$src" in
+    */plugins/modules/*) fix_module_documentation "$src";;
+    esac
  else
    case "$src" in
-    */plugins/modules/*) srcdir=plugins/modules; subdir=library; modules+=("$src") ;;
+    */plugins/modules/*) srcdir=plugins/modules; subdir=library; modules+=("$src"); fix_module_documentation "$src";;
    */plugins/module_utils/*) srcdir=plugins/module_utils; mod_utils+=("$src") ;;
    */plugins/action/*) srcdir=plugins/action ;;
    esac
@ -54,9 +86,6 @@ for src in "${!plugin_map[@]}"; do
      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

@ -92,11 +121,32 @@ done
 # 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 {} \;
+  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
+
+# add ansible-test ignores needed due to vendoring
+for ansible_ver in 2.14 2.15 2.16; do
+  ignore_file="podman/.sanity-ansible-ignore-${ansible_ver}.txt"
+  cat >> "$ignore_file" <<EOF
+plugins/module_utils/podman_lsr/podman/quadlet.py compile-2.7!skip
+plugins/module_utils/podman_lsr/podman/quadlet.py import-2.7!skip
+plugins/modules/podman_image.py import-2.7!skip
+plugins/modules/podman_play.py import-2.7!skip
+EOF
+done
+# these platforms still use python 3.5
+for ansible_ver in 2.14 2.15; do
+  ignore_file="podman/.sanity-ansible-ignore-${ansible_ver}.txt"
+  cat >> "$ignore_file" <<EOF
+plugins/module_utils/podman_lsr/podman/quadlet.py compile-3.5!skip
+plugins/module_utils/podman_lsr/podman/quadlet.py import-3.5!skip
+plugins/modules/podman_image.py import-3.5!skip
+plugins/modules/podman_play.py import-3.5!skip
+EOF
 done
--- a/SPECS/linux-system-roles.spec
+++ b/SPECS/linux-system-roles.spec
@ -11,6 +11,11 @@ BuildRequires: ansible-core >= 2.11.0

 %bcond_with collection_artifact

+# This is to avoid ansible-test errors like
+# ERROR: lsr_role2coll_extra_script-vpn:1:1: unexpected non-module shebang: b'#!/usr/bin/bash'
+# we use /usr/bin/env bash in all of our scripts - we don't want rpm to fix them
+%undefine __brp_mangle_shebangs
+
 %if 0%{?rhel}
 Name: rhel-system-roles
 %else
@ -18,8 +23,8 @@ Name: linux-system-roles
 %endif
 Url: https://github.com/linux-system-roles
 Summary: Set of interfaces for unified system management
-Version: 1.23.0
-Release: 2.21%{?dist}
+Version: 1.88.9
+Release: 0.1%{?dist}

 License: GPLv3+ and MIT and BSD and Python
 %global _pkglicensedir %{_licensedir}/%{name}
@ -81,101 +86,107 @@ Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0)
 %%global rolestodir %%{?rolestodir} %%{roletodir%{1}}
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 %global rolename24 journald
-%deftag 24 1.2.3
+%deftag 24 1.3.3

 %global rolename25 postgresql
-%deftag 25 1.3.5
+%deftag 25 1.3.8

 %global rolename26 systemd
-%deftag 26 1.1.2
+%deftag 26 1.2.0

 %global rolename27 keylime_server
-%deftag 27 1.1.2
+%deftag 27 1.1.5

 %global rolename28 fapolicyd
-%deftag 28 1.1.1
+%deftag 28 1.1.7

 %global rolename29 bootloader
-%deftag 29 1.0.3
+%deftag 29 1.0.7

 %global rolename30 snapshot
-%deftag 30 1.3.1
+%deftag 30 1.4.1
+
+%global rolename31 gfs2
+%deftag 31 1.0.0
+
+%global rolename32 sudo
+%deftag 32 1.1.0

 Source1: %{archiveurl1}
 Source2: %{archiveurl2}
@ -207,6 +218,8 @@ Source27: %{archiveurl27}
 Source28: %{archiveurl28}
 Source29: %{archiveurl29}
 Source30: %{archiveurl30}
+Source31: %{archiveurl31}
+Source32: %{archiveurl32}
 # END AUTOGENERATED SOURCES

 # Includes with definitions/tags that differ between RHEL and Fedora
@ -225,15 +238,6 @@ Source1004: vendoring-build.inc
 Source995: CHANGELOG.md

 BuildArch: noarch
-# 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
@ -281,7 +285,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 -a25 -a26 -a27 -a28 -a29 -a30 -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 -a31 -a32 -n %{getarchivedir 0}
 # END AUTOGENERATED SETUP

 # vendoring prep steps, if any
@ -356,16 +360,10 @@ rm %{rolename5}/tests/playbooks/roles
 # when python2 is default python.
 rm %{rolename5}/scripts/print_all_options.py
 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
 # remove upstream-only documentation - for example, documentation
 # about collection dependencies is not needed in Fedora and EL RPMs
@ -458,6 +456,18 @@ for role in %{rolenames}; do
    %{collection_build_path}/roles/$role/README.md
 done

+# we have removed some files - ensure that the ignore files refer only to
+# existing files
+for ignore_file in %{collection_build_path}/tests/sanity/ignore-*.txt; do
+  cp "$ignore_file" "$ignore_file.tmp"
+  while read -r file rest; do
+    if [ ! -f "%{collection_build_path}/$file" ]; then
+      sed "\,^${file} ,d" -i "$ignore_file"
+    fi
+  done < "$ignore_file.tmp"
+  rm "$ignore_file.tmp"
+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
@ -677,6 +687,149 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \
 %endif

 %changelog
+* Fri Sep 13 2024 Rich Megginson <rmeggins@redhat.com> - 1.88.9-0.1
+- Resolves: RHEL-56626 : podman - fails to configure and run containers with podman rootless using different username and groupname
+- logging - test issue with imuxsock and loginctl used by podman - restart systemd-logind to fix podman tests
+- updates collection README for new Automation Hub format
+
+* Wed Sep 11 2024 Rich Megginson <rmeggins@redhat.com> - 1.88.8-0.1
+- Resolves: RHEL-56626 : podman - fails to configure and run containers with podman rootless using different username and groupname
+- podman - previous fix broke ansible 2.9 + el8 with volume cleanup
+- logging - test issue with imuxsock and journald - restart dbus-broker
+
+* Wed Sep  4 2024 Rich Megginson <rmeggins@redhat.com> - 1.88.7-0.2
+- Resolves: RHEL-56626 : podman - fails to configure and run containers with podman rootless using different username and groupname
+- fapolicyd - fix method used to read from journald to determine when daemon is listening
+- storage - fix tests to use blkid instead of lsblk to get partition table
+- storage - skip stratis tests on el8
+- logging - tests_combination.yml needs fact gathering
+- same as 1.88.7-0.1 but needed to bump N-V-R and rebuild for exception
+
+* Wed Sep  4 2024 Rich Megginson <rmeggins@redhat.com> - 1.88.7-0.1
+- Resolves: RHEL-56626 : podman - fails to configure and run containers with podman rootless using different username and groupname
+- fapolicyd - fix method used to read from journald to determine when daemon is listening
+- storage - fix tests to use blkid instead of lsblk to get partition table
+- storage - skip stratis tests on el8
+- logging - tests_combination.yml needs fact gathering
+
+* Mon Aug 26 2024 Rich Megginson <rmeggins@redhat.com> - 1.88.4-0.1
+- Resolves: RHEL-53896 : kernel_settings - fix: Use tuned files instead of using it as a module
+- recent tuned in el9 changed the profile directory back to the old one
+- so had to change the role to detect directory
+
+* Thu Aug 22 2024 Rich Megginson <rmeggins@redhat.com> - 1.88.3-0.1
+- Resolves: RHEL-34214 : gfs2 - New Role
+- no el10, aarch64 support for gfs2
+- network role docs
+
+* Wed Aug 21 2024 Rich Megginson <rmeggins@redhat.com> - 1.88.2-0.1
+- Resolves: RHEL-55295 : ha_cluster - Fixes for new pcs and ansible
+- several fixes for ostree issues
+
+* Tue Aug 20 2024 Rich Megginson <rmeggins@redhat.com> - 1.88.0-0.1
+- Resolves: RHEL-55295 : ha_cluster - Fixes for new pcs and ansible
+- fix gather_facts issue with fapolicyd
+- fix gather_facts issue with ha_cluster
+- fix bond test firewall issue with network
+
+* Mon Aug 19 2024 Rich Megginson <rmeggins@redhat.com> - 1.87.2-0.1
+- Resolves: RHEL-50825 : System Roles: No module documentation
+- Fix storage role tests_lvm_pool_pv_grow issue with pvcreate hang on el7
+- podman - skip quadlet tests on non-x86_64 arch
+- journald - fix the test pattern that looks for the max size
+- network - fix the bond tests issue with firewall
+- sshd - add new parameters for openssh 9.8
+
+* Fri Aug 16 2024 Rich Megginson <rmeggins@redhat.com> - 1.87.1-0.1
+- Resolves: RHEL-30888 : storage - Fingerprint storage RHEL System Role managed config files
+- s390x issue fix requires fix for architecture fact
+
+* Fri Aug 16 2024 Rich Megginson <rmeggins@redhat.com> - 1.87.0-0.1
+- Resolves: RHEL-48227 : snapshot - feat: rewrite snapshot.py as an Ansible module / add support for thin origins
+- some test fixes in snapshot, network
+
+* Fri Aug  9 2024 Rich Megginson <rmeggins@redhat.com> - 1.86.0-0.1
+- Resolves: RHEL-53896 : kernel_settings - fix: Use tuned files instead of using it as a module
+- Resolves: RHEL-3252 : network - support route src parameter
+- Resolves: RHEL-53902 : rhc - fix: drop usage of "auto_attach" of the "redhat_subscription" module
+
+* Thu Aug  1 2024 Rich Megginson <rmeggins@redhat.com> - 1.85.0-0.1
+- Resolves: RHEL-49596 : ha_cluster - alerts support
+- other fixes for el10 support
+- add timesync_provider.sh side car doc for Automation Hub rendering issue
+
+* Tue Jul 23 2024 Rich Megginson <rmeggins@redhat.com> - 1.84.1-0.1
+- Resolves: RHEL-46590 : logging - RFE - system-roles - logging: Add truncate options for local file inputs
+- Resolves: RHEL-40273 : logging - redhat.rhel_system_roles.logging role fails to process logging_outputs: of type: "custom"
+- Resolves: RHEL-34935 : logging - [RFE] Add the umask settings or enable a variable in linux-system-roles.logging
+- Resolves: RHEL-50102 : podman - fix: proper cleanup for networks; ensure cleanup of resources
+- Resolves: RHEL-30888 : storage - Fingerprint storage RHEL System Role managed config files
+
+* Mon Jul 15 2024 Rich Megginson <rmeggins@redhat.com> - 1.83.0-0.1
+- Resolves: RHEL-46854 : postfix - feat: Added postfix_files feature as a simple means to add extra files/maps to config
+- Resolves: RHEL-48227 : snapshot - feat: rewrite snapshot.py as an Ansible module / add support for thin origins
+
+* Tue Jul 02 2024 Rich Megginson <rmeggins@redhat.com> - 1.82.0-0.1
+- Resolves: RHEL-41090 : cockpit - cockpit install all wildcard match does not work in newer el9
+- Resolves: RHEL-45717 : nbde_client - feat: Allow initrd configuration to be skipped
+- Implements meta/main.yml el10 support in most roles
+
+* Wed Jun 12 2024 Rich Megginson <rmeggins@redhat.com> - 1.79.0-0.3
+- add patch for https://github.com/containers/ansible-podman-collections/pull/784
+  this is blocking gating tests
+
+* Tue Jun 11 2024 Rich Megginson <rmeggins@redhat.com> - 1.79.0-0.2
+- Resolves: RHEL-39996 : bootloader - Set user.cfg path to /boot/grub2/ on EL 9 UEFI
+- Resolves: RHEL-35561 : logging - Setup imuxsock using rhel-system-roles.logging causing an error
+  fix test
+- Resolves: RHEL-40761 : podman - fix: grab name of network to remove from quadlet file
+- Resolves: RHEL-39438 : podman - Create podman secret when skip_existing=True and it does not exist
+- Resolves: RHEL-40180 : ssh - Add new configuration options and remove false positives in the test
+- Resolves: RHEL-31854 : storage - [RFE] manage stratis
+- Resolves: RHEL-25777 : storage - rhel-system-role.storage is not idempotent
+- Resolves: RHEL-14862 : storage - [RHEL9][RFE] resize LVM PVs
+- Resolves: RHEL-25994 : storage - var unused_disks get different sector size disks
+
+* Tue May 21 2024 Sergei Petrosian <spetrosi@redhat.com> - 1.79.0-0.1
+- Resolves: RHEL-35561 : logging - Setup imuxsock using rhel-system-roles.logging causing an error
+- Resolves: RHEL-37549 : sudo - Add sudo system role
+
+* Thu Apr 25 2024 Rich Megginson <rmeggins@redhat.com> - 1.78.1-0.1
+- fix some issues with ansible-test
+- Resolves: RHEL-34214 : gfs2 - New Role
+
+* Mon Apr 22 2024 Rich Megginson <rmeggins@redhat.com> - 1.77.0-0.1
+- Resolves: RHEL-18075 :  - package rhel-system-roles.noarch does not provide docs for ansible-doc
+- Resolves: RHEL-33532 : ha_cluster - [RFE] rhel_system_roles.ha_cluster - Utilization Support
+- Resolves: RHEL-33076 : ha_cluster - Fix inconsistent approach for multiple `attributes.attrs` in `ha_cluster_node_options`
+- Resolves: RHEL-32872 : network - Fix testing Failures due to connection.autoconnect-ports Unknown Property
+- Resolves: RHEL-33547 : podman - feat: manage TLS cert/key files for registry connections and validate certs
+- Resolves: RHEL-30185 : podman - podman role should support default credentials and per-unit credentials
+- Resolves: RHEL-30183 : podman - podman role should support containers-auth.json
+- Resolves: RHEL-25777 : storage - rhel-system-role.storage is not idempotent
+
+* Mon Apr 15 2024 Rich Megginson <rmeggins@redhat.com> - 1.76.2-0.1
+- Fix ansible-test issues
+  Ensure "WARNING: " is quoted in description string
+  Package doc_fragments for vendored modules
+  Fix wrong collection deprecation error
+  undefine __brp_mangle_shebangs because ansible-test does not like shebangs in executable files
+  ensure that any files removed during the build/install process are also removed
+  from ignore files
+- Resolves: RHEL-28658 : ad_integration - fix: Sets domain name lower case in realmd.conf section header
+- Resolves: RHEL-26714 : bootloader - bootloader role tests do not work on ostree
+- Resolves: RHEL-30111 : ha_cluster - [RFE] ha_cluster_node_options allows per-node addresses and SBD options to be set
+- Resolves: RHEL-27186 : ha_cluster - [RFE] make it easier to install cloud agents
+- Resolves: RHEL-17271 : ha_cluster - [RFE] rhel_system_roles.ha_cluster - ACL Support
+- Resolves: RHEL-30170 : journald - feat: Add options for rate limit interval and burst
+- Resolves: RHEL-25264 : network - Make sure that the network role CI is solid robust
+- Resolves: RHEL-32464 : podman - fix: do not use become for changing hostdir ownership, and expose subuid/subgid info
+- Resolves: RHEL-32382 : podman - fix: use correct user for cancel linger file name
+- Resolves: RHEL-30185 : podman - podman role should support default credentials and per-unit credentials
+- Resolves: RHEL-29309 : sshd - second SSHD service broken
+- Resolves: RHEL-30959 : storage - [RHEL9]  storage role resize volume  failed
+- Resolves: RHEL-29874 : storage - Running rhel-system-roles.storage w/ type: raid a second time, fails if existing RAID device has stratis installed on them.
+
 * Mon Feb 26 2024 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.21
 - Resolves: RHEL-16336 : bootloader - Create bootloader role (MVP)
  fix issue with path on arches other than x86_64, and EFI systems