diff --git a/.gitignore b/.gitignore index 28cb40a..cc855b2 100644 --- a/.gitignore +++ b/.gitignore @@ -740,3 +740,36 @@ /cockpit-1.5.5.tar.gz /postgresql-1.3.5.tar.gz /bootloader-1.0.3.tar.gz +/ad_integration-1.4.4.tar.gz +/ansible-sshd-v0.23.5.tar.gz +/auto-maintenance-1.76.2.tar.gz +/bootloader-1.0.4.tar.gz +/certificate-1.3.4.tar.gz +/cockpit-1.5.6.tar.gz +/crypto_policies-1.3.3.tar.gz +/fapolicyd-1.1.2.tar.gz +/firewall-1.7.5.tar.gz +/ha_cluster-1.16.0.tar.gz +/journald-1.3.0.tar.gz +/kdump-1.4.5.tar.gz +/kernel_settings-1.2.3.tar.gz +/keylime_server-1.1.3.tar.gz +/logging-1.12.6.tar.gz +/metrics-1.10.2.tar.gz +/nbde_client-1.2.18.tar.gz +/nbde_server-1.4.4.tar.gz +/network-1.15.2.tar.gz +/podman-1.4.9.tar.gz +/postfix-1.4.4.tar.gz +/postgresql-1.3.6.tar.gz +/rhc-1.6.3.tar.gz +/selinux-1.7.5.tar.gz +/snapshot-1.3.2.tar.gz +/ssh-1.3.3.tar.gz +/storage-1.16.4.tar.gz +/systemd-1.1.3.tar.gz +/timesync-1.8.3.tar.gz +/tlog-1.3.4.tar.gz +/vpn-1.6.4.tar.gz +/community-general-8.5.0.tar.gz +/containers-podman-1.12.1.tar.gz diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a13001..c3d59d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,26 @@ Changelog ========= +[1.76.2] - 2024-07-15 + +### New Features + +- [bootloader - bootloader role tests do not work on ostree](https://issues.redhat.com/browse/RHEL-26714) +- [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) +- [journald - feat: Add options for rate limit interval and burst](https://issues.redhat.com/browse/RHEL-30170) +- [podman - podman role should support default credentials and per-unit credentials](https://issues.redhat.com/browse/RHEL-30185) + +### Bug Fixes + +- [ad_integration - fix: Sets domain name lower case in realmd.conf section header](https://issues.redhat.com/browse/RHEL-28658) +- [network - Make sure that the network role CI is solid robust](https://issues.redhat.com/browse/RHEL-25264) +- [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) +- [sshd - second SSHD service broken](https://issues.redhat.com/browse/RHEL-29309) +- [storage - [RHEL9] storage role resize volume failed](https://issues.redhat.com/browse/RHEL-30959) +- [storage - Running rhel-system-roles.storage w/ type: raid a second time, fails if existing RAID device has stratis installed on them.](https://issues.redhat.com/browse/RHEL-29874) + [1.23.0] - 2024-01-15 ---------------------------- diff --git a/extrasources.inc b/extrasources.inc index d056b78..b438c12 100644 --- a/extrasources.inc +++ b/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-8.5.0.tar.gz +Source902: https://galaxy.ansible.com/download/containers-podman-1.12.1.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)) = 8.5.0 +Provides: bundled(ansible-collection(containers.podman)) = 1.12.1 Source996: CHANGELOG.rst Source998: collection_readme.sh diff --git a/linux-system-roles.spec b/linux-system-roles.spec index 59c1bf5..c451fb6 100644 --- a/linux-system-roles.spec +++ b/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.76.2 +Release: 0.1%{?dist} License: GPLv3+ and MIT and BSD and Python %global _pkglicensedir %{_licensedir}/%{name} @@ -81,101 +86,101 @@ Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0) %%global rolestodir %%{?rolestodir} %%{roletodir%{1}} } -%global mainid 11ad785c9bb72611244e7909450ca4247e12db4d +%global mainid 1.76.2 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.4.4 %global rolename2 selinux -%deftag 2 1.7.4 +%deftag 2 1.7.5 %global rolename3 timesync -%deftag 3 1.8.2 +%deftag 3 1.8.3 %global rolename4 kdump -%deftag 4 1.4.4 +%deftag 4 1.4.5 %global rolename5 network -%deftag 5 1.15.1 +%deftag 5 1.15.2 %global rolename6 storage -%deftag 6 1.16.2 +%deftag 6 1.16.4 %global rolename7 metrics -%deftag 7 1.10.1 +%deftag 7 1.10.2 %global rolename8 tlog -%deftag 8 1.3.3 +%deftag 8 1.3.4 %global rolename9 kernel_settings -%deftag 9 1.2.2 +%deftag 9 1.2.3 %global rolename10 logging -%deftag 10 1.12.4 +%deftag 10 1.12.6 %global rolename11 nbde_server -%deftag 11 1.4.3 +%deftag 11 1.4.4 %global rolename12 nbde_client -%deftag 12 1.2.17 +%deftag 12 1.2.18 %global rolename13 certificate -%deftag 13 1.3.3 +%deftag 13 1.3.4 %global rolename14 crypto_policies -%deftag 14 1.3.2 +%deftag 14 1.3.3 %global forgeorg15 https://github.com/willshersystems %global repo15 ansible-sshd %global rolename15 sshd -%deftag 15 v0.23.2 +%deftag 15 v0.23.5 %global rolename16 ssh -%deftag 16 1.3.2 +%deftag 16 1.3.3 %global rolename17 ha_cluster -%deftag 17 1.14.0 +%deftag 17 1.16.0 %global rolename18 vpn -%deftag 18 1.6.3 +%deftag 18 1.6.4 %global rolename19 firewall -%deftag 19 1.7.4 +%deftag 19 1.7.5 %global rolename20 cockpit -%deftag 20 1.5.5 +%deftag 20 1.5.6 %global rolename21 podman -%deftag 21 1.4.7 +%deftag 21 1.4.9 %global rolename22 ad_integration -%deftag 22 1.4.2 +%deftag 22 1.4.4 %global rolename23 rhc -%deftag 23 1.6.0 +%deftag 23 1.6.3 %global rolename24 journald -%deftag 24 1.2.3 +%deftag 24 1.3.0 %global rolename25 postgresql -%deftag 25 1.3.5 +%deftag 25 1.3.6 %global rolename26 systemd -%deftag 26 1.1.2 +%deftag 26 1.1.3 %global rolename27 keylime_server -%deftag 27 1.1.2 +%deftag 27 1.1.3 %global rolename28 fapolicyd -%deftag 28 1.1.1 +%deftag 28 1.1.2 %global rolename29 bootloader -%deftag 29 1.0.3 +%deftag 29 1.0.4 %global rolename30 snapshot -%deftag 30 1.3.1 +%deftag 30 1.3.2 Source1: %{archiveurl1} Source2: %{archiveurl2} @@ -225,15 +230,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 @@ -458,6 +454,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 +685,28 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \ %endif %changelog +* Mon Apr 15 2024 Rich Megginson - 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 - 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 diff --git a/sources b/sources index 26308bd..8bd600a 100644 --- a/sources +++ b/sources @@ -1,34 +1,34 @@ -SHA512 (ad_integration-1.4.2.tar.gz) = 1772eb6a61a6246f69681c8539178b1aade85ca1bdb8dcb3d6ceb10de758c128e31a62f7e20948814c16928b00df9de412c56f487ec4929c0f9c831afae4cc27 +SHA512 (ad_integration-1.4.4.tar.gz) = add0ad8836fecb4ee4bc37d224a8d3e423493590adbc1eeed5b840987c05b455210cf433c7d475b85a5d6d13d53b9dba5e8f215d165ebbc87041e8e713ca5fab SHA512 (ansible-posix-1.5.4.tar.gz) = 63321c2b439bb2c707c5bea2fba61eaefecb0ce1c832c4cfc8ee8bb89448c8af10e447bf580e8ae6d325c0b5891b609683ff2ba46b78040e2c4d3d8b6bdcd724 -SHA512 (ansible-sshd-v0.23.2.tar.gz) = 49b5919fe50486574889b300b30804055a3be91969e1e7065ca97fbeac8ed0f5dd9a2747d194e5aa6a8e4c01f9ae28a73f6d68dab48dae6eccb78f4ebf71b056 -SHA512 (auto-maintenance-11ad785c9bb72611244e7909450ca4247e12db4d.tar.gz) = a8347b15e420ba77e1086193154dec9e0305474050493cb0be156a7afeb00d0bc02617cadcc77ac48d9cd9d749e1bd4f788d4def01b51a3356a4bd74c65912ea -SHA512 (bootloader-1.0.3.tar.gz) = 5838e37e9e9f55f757d12ba0ae75b4a707b2f0731cd9d866fbde8fad8ae25c5fdb05c83bada0919cb39f7daca9f56fc06740c7da5fdce017da32ae22a0619a10 -SHA512 (certificate-1.3.3.tar.gz) = f459cf3f388b7e8d686ad1502c976900b3fe95e8a63f16c1ec2b739fad86de1adf4cabe41e1b8d0173f408db6465aa08ab5bd4d13f00e6e4c57520adc5b44c3b -SHA512 (cockpit-1.5.5.tar.gz) = 728c858de1133dc8dd62337cb58d06794d57a571e41d30c172fe687942cb8be45ae3d15b71816eb5f3d9462f451b94c47c946c7bb5e4f9a541d3b161d4b1c497 -SHA512 (community-general-8.3.0.tar.gz) = 674123b7e72ecfe24d82980dae075123999202e7e5de759506a8f9b5df2b072afefbf199516a64dd217d8e6d45ab2952838cf5ad534df20ee3f58e06c8837736 -SHA512 (containers-podman-1.12.0.tar.gz) = c568b6e5ed36c3f46aba854489317aa992872b32a8b27e06e1561fd0362b455c063e923bddc8201788834043a90c20568ce8f69f7b9e6f7c864864e11f1ea733 -SHA512 (crypto_policies-1.3.2.tar.gz) = 8007402391778b7c8625af8fd6b96d77ec930180746a87c1c2ade0f4f7a17deaac66e28d94f18e25b0fea68274ad88e0f1ce9eec40fd3abc10d8a4891dd04b53 -SHA512 (fapolicyd-1.1.1.tar.gz) = 462877da988f3d9646c33757cd8f1c6ab6a2df145cf9021edd5fbc9d3fea8d0aa3c515b4d1cf20724bfefa340919f49ce5a90648fa4147b60cec4483a6bbfe83 -SHA512 (firewall-1.7.4.tar.gz) = 1298c7a4bd23e06318bf6ca5bca12281898620f7d8f645a4d21f556f68cd0a03dd99e7118cf9e27f2f5a86bc9a8c621bcd5433eabb73976e65f80ab8050452b7 -SHA512 (ha_cluster-1.14.0.tar.gz) = 05f626e3bfbbd515e9a05f4cd74793d636ba6297bab8f6ed03e42d6d63fc38fcbc1552cfe26399f9e2966c1dbe9bdcd9c8b9f6faa813032fdab772bbd2c8b4f5 -SHA512 (journald-1.2.3.tar.gz) = f51cbbe1f03ce25d8a1c6b492433727a3407d805a3ccb55781a395f0d6156844cf683819853c14c40a3f21f347368c9bf6864cbaebe3ed67640f02646d54873a -SHA512 (kdump-1.4.4.tar.gz) = 1fe5f6c5f3168adaec135f0c8c3bc109d65fca48c96948704ef570692b0b1e03afd73f53964103dbd2c156eddcc01833da7330245810ac9dc017202974191f2e -SHA512 (kernel_settings-1.2.2.tar.gz) = 548fd51b89436be2ec0b45f81a738e949506ad1f6ce5ce72098c5aacd4df1df3cd2d00296cee112792b2833713f84b755c5ce7b0cb251fd2bb543a731ab895e1 -SHA512 (keylime_server-1.1.2.tar.gz) = c0bdd3e570edcd1ba4dbbc61ae35015c82367f73f254acd3b06cb42fb88864042b383c8185f7611bcdb7eb219f484981fc5cb6c098ac2f2126a6bce1204401eb -SHA512 (logging-1.12.4.tar.gz) = fa9fda7c857a6405187d2f434e7626b7d61a98e57f454166b480c5d87a5b61593e47825be68b9f9d005d02a31c3ebb128a6a3c9bff02ee7d6f7c27a2e9d2f2e3 -SHA512 (metrics-1.10.1.tar.gz) = 648c1f7ff8b35048c7ef272df5db8240f0b62fb4de998fa45ad5c79ecd9337f9f95c280d6d37e390749f398c1f4f04f634203be6c5d387e1154341ec8ad1aa4c -SHA512 (nbde_client-1.2.17.tar.gz) = f11189c4cf42478d166c8528b75ea02d32bb412e16fa6c47e205905b731e02c1791b6e564d89d8568448d2d3f8995b263116199801f1cc69593aafc0aa503818 -SHA512 (nbde_server-1.4.3.tar.gz) = ed309ae3890ac9e9c05f70206044ed1e2d0876733a2b2e8f3064411870dd17e09d0072e843c1e4394e3ac7a1891f40ef69604836cc4577dcf0b2ef024ba256df -SHA512 (network-1.15.1.tar.gz) = b1b504a66ab2975fb01ce7129343bab18013c91d3c7f4c633b696488364f48e5e59980c1101fa506aa789bc784d7f6aff7d1536875aa43016bcb40986a175e5c -SHA512 (podman-1.4.7.tar.gz) = ff25604e0d38acf648863de3ca8681466adab37aabe9bea3ff295afb94a2c682bade9563b274b8630cb46670f0d82b6431e366551594bfe47145da024fc3d726 -SHA512 (postfix-1.4.3.tar.gz) = 8948272377051ff77139cfe2e4ec58e94d931fc9107f7fda3755db7371d13d73d6c626a8291dcf3d0c2af07655d01a1c50e8645b1f6d5bf19db90dc920568ed4 -SHA512 (postgresql-1.3.5.tar.gz) = f3d2fb191a2b820bb74ec4394d3795e695507b5a20ce8341698a474b7968a31a6f6886abb2575e03b866064ab5c6667f83a8d0cc7ad544da5a2d2f2125be2089 -SHA512 (rhc-1.6.0.tar.gz) = 285cbda3cb6a62bfb093df6300c5607b94d83aa5652b4b63ee3022d369d81745976ba3137a8e08a8eacd4772f28c7276b26bdddd2ce36dc3f268487990b7a597 -SHA512 (selinux-1.7.4.tar.gz) = 6fcbd51ea51c7674363e137a2b194340254663ebb7312b76613d0efa52ead65226211d800be48354d394d4a159fe8172369bba4f5876980999b15c8112016863 -SHA512 (snapshot-1.3.1.tar.gz) = f50f6509669c612d3ce95de32a841ca2a34095478614c27b94dee6bb6ab2da8d28b258383c54398b9404304ccbb63cbe51da5f9b3dc59efe515e013dc6a11317 -SHA512 (ssh-1.3.2.tar.gz) = 89533339fa9e3420f88f320dcead50e6e14db415201bb21c2b8a47ad96013c3ce59fc883963205ccb921e65a75f1cf38859f8d93ff7032a99fcabc0eaba4b5d7 -SHA512 (storage-1.16.2.tar.gz) = c2e26178396bda7badc8cd1fb5c74e3676c9b4adcd174befd5ea76a35cb639e101d2aeafb38ac04f1e6123a5a52001bf0302fe198de20e7f958ad7c704fe2974 -SHA512 (systemd-1.1.2.tar.gz) = 0b9ad42f6dff4c563a879ba4ff7f977c4ecd8595d6965a998d10bf8e3fdffa04b25bbc9e1f3deacffb263bd92910554f2f7d879dabf4c2fcf48f8bbaa91c14c0 -SHA512 (timesync-1.8.2.tar.gz) = 301156a23a26cd93f919112bf972f27ed5a154ccd9e1167c1ef7a9066d5a8519c40e839f0ae4b0f8a3e04dfad5fc1c3b00166cfbd4f15d46e12ebdfec42f87a6 -SHA512 (tlog-1.3.3.tar.gz) = 9130559ad2d3ec1d99cb5dbbb454cd97c9490c82cf92d45b3909ac521ef6f3ab52a00180418f77775bbe0d83e80a35d9f9b4d51ca5ba4bb9ced62caf4e3f34fd -SHA512 (vpn-1.6.3.tar.gz) = 5feb32a505806fc270ca9c1a940e661e2a0bf165f988dfc0a5c66893ee8fb6c77616497c9fc768617e9cd9dc6bb6e785b184a192b0471878885531e209aadf50 +SHA512 (ansible-sshd-v0.23.5.tar.gz) = 9c4b33ea65b71a913ab7a5efb19877e379d3871ece95369725cb749f969a049c16e7858ce1c7d874a2f634b8287171a6f8cee25c1c8aa641bb025893718f3ea3 +SHA512 (auto-maintenance-1.76.2.tar.gz) = 42116c05c37ff73ba2d30fce51da08afed31aa760a4588e2c35a18ef874e33187391f17ffbf4f7e18b676d0a94af6667ce1033303cd9bb3d4af5b5e4f7383f92 +SHA512 (bootloader-1.0.4.tar.gz) = b4766b239c7e612735e22463c816424c941b1283e03b1bd4df7adcd48b461148cdab989adc2a11927a56def2b562b5a1b606da130cfb65228d0f9a72d94ec660 +SHA512 (certificate-1.3.4.tar.gz) = 7fff3afd55836228cbd116e805e64855e390f2926eaa8dc5ca9c878f10a8171fd633257c32e27d391bd0e723a2138ff24e3fc6e5b10dead4e5fc39f3e84c3fe3 +SHA512 (cockpit-1.5.6.tar.gz) = 15a85ec53e9f0134bb74b6dcc15102828fe90e5265686fec18565a934feb75350bcd77dd8a443fa93900538562e826f038798f2bcd5bb56830c99a5d8200d325 +SHA512 (community-general-8.5.0.tar.gz) = e9827a972a7dc8992f747067b294c9426d774a6a4af7ab9e759a7a9fcffd856263de24e59f4a55b403654e58a00a8fc1524f2d43eb9ccf0e4b71ef4232eaef46 +SHA512 (containers-podman-1.12.1.tar.gz) = 4f6c0929366f350a604c8c1b91de289e890d0fc5bed6ca4b3a6d0e5776395a556d347bb3c8eb4fd1d2d2f89f499d661bb9bf62c1abf9e96143a6de7828768b4a +SHA512 (crypto_policies-1.3.3.tar.gz) = 0bd3bc2d129dcad06d26bee6a5ea9296968f2885ca907d80b7cf4e12141eb3e2e47a7418aaa72e84df7d1642bb0c3d60c9bea2c8bed4a6d5be560467ecb59ba8 +SHA512 (fapolicyd-1.1.2.tar.gz) = 06c01c7bc55fe288b50cde101ea51a1cd78c93fbc58b6eafab2f5aeccdd68938d7aa45e5dbcb513583bcf1ada045837f80d5305e63c9fc0be1ec0ec4e4fbc792 +SHA512 (firewall-1.7.5.tar.gz) = 94bbf05b7796eb91c67bfec8eb6029c56893d5a5da186ed4881d3fe9f3473ebd1fe102f99370c7ee867b1537b286d12cf65bcbf9dfe77d592954ad11367ab781 +SHA512 (ha_cluster-1.16.0.tar.gz) = ae49a7c0de1f6afc965707931d3e24f4b4817800df17adb55650d8215943d0dfe7e231e17283db11f9d2c7176f7bddc2e191ca2d69a4ba0d8cf256a5b57b1026 +SHA512 (journald-1.3.0.tar.gz) = 979d89c3e6b4e7210d92d47e2518f212ad3f869c2272f5a4a23a0bf468d74a28b7a42c9811cc3b5531d57936f3459d6b5a7f102945d98b958ccecae22e600908 +SHA512 (kdump-1.4.5.tar.gz) = 64e37b0f28142c903a162c1892f09b4d0c7224f2305a6b422a2d5aae351172b0c3a7cb8f942f1ff6b651a73e983618d0b9e2ce6080af7df37e9855a2e4ffc2c0 +SHA512 (kernel_settings-1.2.3.tar.gz) = 7a8986e57db3ce59a072d8ac5ecc10cf6ec99ff707ba500cf988b8261dc482412c8218b05facedfb1281e52f1f21b190775b4c488c5be91ac63b718822798313 +SHA512 (keylime_server-1.1.3.tar.gz) = 7b3249c6568c23916d822dddc31f4a8fad19384fa6295b3423057abb597fa9ddd98cce23f1aea0cb79b9122323535db491a4d421c94b9203413a107be2766350 +SHA512 (logging-1.12.6.tar.gz) = 4bc9380c85e0b645b7f6aa919f71599680766e1145b77a9e7dd543a304e27afd69cfd6e740a4df0adddbccf5c60d597b767e50da79136a47cbd7f2bf8bbe4121 +SHA512 (metrics-1.10.2.tar.gz) = f7e6bd062599f2c18593a05de5e0c3f3792198400eda2ebf6f3868a7caad3e238b9626e50ea648b0b3df4bad8d38acad9a76cbb4cfa62df5f5fc48d9305fbf7a +SHA512 (nbde_client-1.2.18.tar.gz) = 8ef9654079c2c8f361a16af9e8378565318f9f3930f71d688b2213c214f858e9dd331faf645809ddf3f2ef1f48770873c8fe6bcb2938e2e73acc7eaec5881aec +SHA512 (nbde_server-1.4.4.tar.gz) = 1df00a8feb90b205ca7c1d739c68976a7f93e5f76652316e154bdd67f2f3d04fbca278ea0f3effc8cfd528134cb4032daeba6aca979ca3f56ea818426b8baddb +SHA512 (network-1.15.2.tar.gz) = 80490c36b675911dd4a59977ae24f06951b0cf835364b5e75bfd60629572686619699e997e900c0782dab97248a4e6812564427a05fa294f0dc140302082523f +SHA512 (podman-1.4.9.tar.gz) = 43f926410a46df1727040a979f0bc377570f169c0e6e9d608b63dd5464a2fdebf482e65e03b5f92bbb87f7b5c69dea1a897ed464ef9f27361331a78044844be1 +SHA512 (postfix-1.4.4.tar.gz) = e650f5810604c3c36cad86a9a2576456810be222f9adca3c2c2069fabfd3539417323c962725b2459ee5ea27b002f435ce08f9a767dec6adf14c3effbe52bb65 +SHA512 (postgresql-1.3.6.tar.gz) = 9377ce86b97df1feccabcb33d3331e48d79fe6dc551afb996949810d08786e5933110fdd657ca10f088026b4187b144222880413832180a8812f39700f821a9f +SHA512 (rhc-1.6.3.tar.gz) = c517f11e514059049c8ca62e0afa5fdfb2defce170565dd651ee426930970a7e7a3ed081bf467a6f3487da3e74006120f56019cec4c40c182b1f209c95020bb2 +SHA512 (selinux-1.7.5.tar.gz) = 6431d34ee53dbef63b8e781e05a0f524509f2e31fedd8fde57e218553434cd21852bbbb6768cd2b0a97a24472e81dfbb057daf003e6a1af3d5aa73679d1fb52f +SHA512 (snapshot-1.3.2.tar.gz) = 4a1dbf3443d4b8addcc4de2583e23ecd116fdfb8eb8c02cff9b8619e63dc7fd61057944e81d5ba137d90f028f371bbef0b8578a074f20f1ecb23087251d249a6 +SHA512 (ssh-1.3.3.tar.gz) = 5da0d102a0344eff983d00683aa4ccb5e5ef454e8360076954bffa015bc76a4ed4a31aa61200a310cf14e3f530d1b4d3b2c7fb3e491f49ca4e7d58c1ca3b85e0 +SHA512 (storage-1.16.4.tar.gz) = 13e46d757678b42047c6744e26d57871c7f8619cce535600d775902085d210cf5b6b977ae3e1067c3f78aa6849c8c0e52c2c4251da8c563330db9b50863894af +SHA512 (systemd-1.1.3.tar.gz) = 88ac7bc7fc1927d76791de35bb0d0910ba94d29275b534053d3fa47536c452b7a648b01282a45abb8b4797fbad9eb1cdca3f28b0d2874c6aa1e95b1a7551ccbb +SHA512 (timesync-1.8.3.tar.gz) = 0e76b6e4cdce1918845628af1f1464c3b7e12c4df068576448a19b62d5f2758e3b083f69acdd2ee3c97a2d6efa0ede07a63c480f384061f9bbb4c679008ba457 +SHA512 (tlog-1.3.4.tar.gz) = 19601df84f6fddf131e1b16a915ba47b649ce19e99e09963931998394a3e179577a7316c79ef924c5ee02b9dd7a28b6f88d363f80a67444f91c78880233b13f2 +SHA512 (vpn-1.6.4.tar.gz) = 43f8c8195c32ba1573fb1213dc7b630121ee4d8ec1f9fff53df96afc1ce7deabdb0833cb68faaccaf67451a81eda23e1850a951c10918401381a27e98d379e8d diff --git a/vendoring-build.inc b/vendoring-build.inc index 9ca374d..1db447e 100644 --- a/vendoring-build.inc +++ b/vendoring-build.inc @@ -24,6 +24,34 @@ declare -A plugin_map=( [containers/podman/plugins/module_utils/podman/common.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 +59,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 +85,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