From 17eff1975aa3a0d4828536635e95b92123633150 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 23 May 2023 15:42:31 -0600 Subject: [PATCH] updates for gather_facts, rhc insights tags, tlog proxy provider rhc - system role does not apply Insights tags Resolves:rhbz#2209200 tlog - use the proxy provider - the files provider is deprecated in sssd Resolves:rhbz#2179458 roles should support running with gather_facts: false Resolves:rhbz#2190502 --- .gitignore | 22 +++++++++++++++ CHANGELOG.md | 12 +++++++++ extrasources.inc | 8 +++--- linux-system-roles.spec | 60 +++++++++++++++++++++++++++-------------- sources | 42 ++++++++++++++--------------- 5 files changed, 99 insertions(+), 45 deletions(-) diff --git a/.gitignore b/.gitignore index 3d38289..58800c6 100644 --- a/.gitignore +++ b/.gitignore @@ -501,3 +501,25 @@ /auto-maintenance-3a0a698cb96e0fccf4d00b45e29414c28c1ab0a1.tar.gz /auto-maintenance-f8932b3155a3cb7579a2b3c453578f7bee6bb837.tar.gz /postgresql-1.0.3.tar.gz +/auto-maintenance-227689a75fb0841d2a224be7408f3ad8db7d525f.tar.gz +/tlog-1.2.15.tar.gz +/rhc-1.1.3.tar.gz +/postgresql-1.0.4.tar.gz +/community-general-7.0.1.tar.gz +/ansible-posix-1.5.4.tar.gz +/auto-maintenance-2957cf9e236e17f522e3033d77e344e962d37d2c.tar.gz +/postfix-1.3.7.tar.gz +/storage-1.10.0.tar.gz +/metrics-1.8.5.tar.gz +/kernel_settings-1.1.16.tar.gz +/logging-1.11.8.tar.gz +/nbde_server-1.3.6.tar.gz +/certificate-1.1.12.tar.gz +/crypto_policies-1.2.10.tar.gz +/ssh-1.1.16.tar.gz +/ha_cluster-1.9.3.tar.gz +/vpn-1.5.7.tar.gz +/cockpit-1.4.6.tar.gz +/podman-1.1.6.tar.gz +/ad_integration-1.1.1.tar.gz +/journald-1.0.4.tar.gz diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ce3814..3d8131c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,18 @@ Changelog ========= +[1.22.0-0.7] - 2023-05-23 +---------------------------- + +### New Features + +- none + +### Bug Fixes + +- [rhc - system role does not apply Insights tags](https://bugzilla.redhat.com/show_bug.cgi?id=2209200) +- [tlog - use the proxy provider - the files provider is deprecated in sssd](https://bugzilla.redhat.com/show_bug.cgi?id=2179458) + [1.22.0-0.6] - 2023-05-04 ---------------------------- diff --git a/extrasources.inc b/extrasources.inc index dfe42af..33c3f01 100644 --- a/extrasources.inc +++ b/extrasources.inc @@ -1,9 +1,9 @@ -Source801: https://galaxy.ansible.com/download/ansible-posix-1.5.2.tar.gz -Source901: https://galaxy.ansible.com/download/community-general-6.6.0.tar.gz +Source801: https://galaxy.ansible.com/download/ansible-posix-1.5.4.tar.gz +Source901: https://galaxy.ansible.com/download/community-general-7.0.1.tar.gz Source902: https://galaxy.ansible.com/download/containers-podman-1.10.1.tar.gz -Provides: bundled(ansible-collection(ansible.posix)) = 1.5.2 -Provides: bundled(ansible-collection(community.general)) = 6.6.0 +Provides: bundled(ansible-collection(ansible.posix)) = 1.5.4 +Provides: bundled(ansible-collection(community.general)) = 7.0.1 Provides: bundled(ansible-collection(containers.podman)) = 1.10.1 Source996: CHANGELOG.rst diff --git a/linux-system-roles.spec b/linux-system-roles.spec index 5f28819..af60467 100644 --- a/linux-system-roles.spec +++ b/linux-system-roles.spec @@ -27,7 +27,7 @@ Name: linux-system-roles Url: https://github.com/linux-system-roles Summary: Set of interfaces for unified system management Version: 1.22.0 -Release: 0.6%{?dist} +Release: 0.7%{?dist} License: GPLv3+ and MIT and BSD and Python %global _pkglicensedir %{_licensedir}/%{name} @@ -86,12 +86,12 @@ Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0) %%global rolestodir %%{?rolestodir} %%{roletodir%{1}} } -%global mainid f8932b3155a3cb7579a2b3c453578f7bee6bb837 +%global mainid 2957cf9e236e17f522e3033d77e344e962d37d2c Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz # BEGIN AUTOGENERATED SOURCES %global rolename1 postfix -%deftag 1 1.3.6 +%deftag 1 1.3.7 %global rolename2 selinux %deftag 2 1.5.9 @@ -106,31 +106,31 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar %deftag 5 1.11.4 %global rolename6 storage -%deftag 6 1.9.8 +%deftag 6 1.10.0 %global rolename7 metrics -%deftag 7 1.8.4 +%deftag 7 1.8.5 %global rolename8 tlog -%deftag 8 1.2.14 +%deftag 8 1.2.15 %global rolename9 kernel_settings -%deftag 9 1.1.15 +%deftag 9 1.1.16 %global rolename10 logging -%deftag 10 1.11.7 +%deftag 10 1.11.8 %global rolename11 nbde_server -%deftag 11 1.3.5 +%deftag 11 1.3.6 %global rolename12 nbde_client %deftag 12 1.2.13 %global rolename13 certificate -%deftag 13 1.1.11 +%deftag 13 1.1.12 %global rolename14 crypto_policies -%deftag 14 1.2.9 +%deftag 14 1.2.10 %global forgeorg15 https://github.com/willshersystems %global repo15 ansible-sshd @@ -138,34 +138,34 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar %deftag 15 v0.19.0 %global rolename16 ssh -%deftag 16 1.1.15 +%deftag 16 1.1.16 %global rolename17 ha_cluster -%deftag 17 1.9.2 +%deftag 17 1.9.3 %global rolename18 vpn -%deftag 18 1.5.6 +%deftag 18 1.5.7 %global rolename19 firewall %deftag 19 1.4.4 %global rolename20 cockpit -%deftag 20 1.4.5 +%deftag 20 1.4.6 %global rolename21 podman -%deftag 21 1.1.5 +%deftag 21 1.1.6 %global rolename22 ad_integration -%deftag 22 1.1.0 +%deftag 22 1.1.1 %global rolename23 rhc -%deftag 23 1.1.2 +%deftag 23 1.1.3 %global rolename24 journald -%deftag 24 1.0.3 +%deftag 24 1.0.4 %global rolename25 postgresql -%deftag 25 1.0.3 +%deftag 25 1.0.4 Source1: %{archiveurl1} Source2: %{archiveurl2} @@ -225,6 +225,8 @@ BuildRequires: highlight # 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} @@ -350,6 +352,13 @@ 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 +# since the dependencies are already provided +sed -e '/^## Requirements/,/^#/s/^See below$/None/' \ + -e '/^### Collection requirements/,/^#/ {/^### Collection/d;/^#/!d}' \ + -i */README.md + %if %{with html} # HACK HACK HACK # pandoc/asciidoc on rhel 8.9 does not like the journald README badge links @@ -645,6 +654,17 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \ %endif %changelog +* Tue May 23 2023 Rich Megginson - 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#2209200 : rhc - system role does not apply Insights tags +- Resolves:rhbz#2179458 : tlog - use the proxy provider - the files provider is deprecated in sssd +- Resolves:rhbz#2190502 : 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 - 1.22.0-0.6 - Resolves:rhbz#2185062 : fingerprint in config files managed by roles - Resolves:rhbz#2185067 : ha_cluster - Add possibility to load SBD watchdog kernel modules diff --git a/sources b/sources index 450087d..99a8249 100644 --- a/sources +++ b/sources @@ -1,29 +1,29 @@ -SHA512 (ad_integration-1.1.0.tar.gz) = 5e94a8af75867425493667b1d5b56706d2cb5e7b28ffe7e361e66e9245bd407cc9572d65f12dbbf1362b3eb7c78370485d0087720c64672fd4677d97714f6655 -SHA512 (ansible-posix-1.5.2.tar.gz) = f99b8e33c6eb4a40903c85f8de093f3e714fecad6e0342d84aee33988220d8e55c7ac2d2a835f5c4d6a23d05cff6eda767e9f61e83cb1146a9ceadf7d1b16f18 +SHA512 (ad_integration-1.1.1.tar.gz) = ec56c242adf63afde35a2ac0b9af1159ce68e70c605ebc6e833f0a049a724dac97f88fbea80310a67242d99668c13a7722d4dafa3335a5b108a45b64c8725486 +SHA512 (ansible-posix-1.5.4.tar.gz) = 63321c2b439bb2c707c5bea2fba61eaefecb0ce1c832c4cfc8ee8bb89448c8af10e447bf580e8ae6d325c0b5891b609683ff2ba46b78040e2c4d3d8b6bdcd724 SHA512 (ansible-sshd-v0.19.0.tar.gz) = 06103696ee1810a8cdbb7f26e0542e85e53c6b758dbc9d87e47a3fd024c8c7fb77b54934e227b0ece4712483d89d52b1e94b1ee5cb667e420261928e8e994b53 -SHA512 (auto-maintenance-f8932b3155a3cb7579a2b3c453578f7bee6bb837.tar.gz) = ebae3911dd9d34bdafbe583d29c7aaa5d6eb082adc4a06dbca4cef68c2f37b86cd15d37255fa3e9675c142d8ff5d863d8b7df77b12e32ebad64965dd9d5cea3c -SHA512 (certificate-1.1.11.tar.gz) = e5b0b5070e97125f3ef8cd0f68bb6a309dba61f974d09e4be2410c4cd9bdfb6f619513cb34be1825c9e8a0bd1365e5f2987a750b255e117ac8dff0e290deb143 -SHA512 (cockpit-1.4.5.tar.gz) = abe66beab3fe3692fe09c65fcb937a6d0fdea63df258dd469c3a235004e49b020f2d151a91b5acd59bc20717a80be765b16fee1057fbe978c3e3fb5d24da6c8d -SHA512 (community-general-6.6.0.tar.gz) = f62269029f3248e82c7bbfabdfac46a7782fd7b05c8b9e6ba50f4e7c41edfbe891908a588e6c7c10845cc7056107a4b0482d9b8c6e0159b64a6c0170a2a255a9 +SHA512 (auto-maintenance-2957cf9e236e17f522e3033d77e344e962d37d2c.tar.gz) = 3bef702f6954910ee9589e63b909a9b3a527d0a8f5048b496eb7c34d370c5e94f3e2765600ece83fb7fdd951c2635920ef00e873f5ed40657c126d99d739815f +SHA512 (certificate-1.1.12.tar.gz) = c584a87a8eab8a514c5c3667a09146e476f61ddc257334f703fea16da840feb3c6c9046f78bf0fe223e732662eeade1638b57442524aef42ca998ddca7770a69 +SHA512 (cockpit-1.4.6.tar.gz) = 43163e01633c381bbae2897d0e39381de6574eb5605550f1336e67c1ccea0cb45b3790aefdadc0dfd6d5a36390174a76d4f015990528fb9c0d13534367ebd0e1 +SHA512 (community-general-7.0.1.tar.gz) = c8febfd1b235a96899d6d41784eef844703004e7e043b9521c5bf30df8d990e00e1665ccc4960e7c14d5ead1e323ddf8f91e363ee41bfbfbdb558e4a40ea6fb6 SHA512 (containers-podman-1.10.1.tar.gz) = 6b489058ae2c38124d0466bd7dccc28b4f36d00c37520399c7d36e1dddb6bc63358f74cccd511067c355364f83e95f3e5256ffb2f9b3dc9d925df0ff74fde77c -SHA512 (crypto_policies-1.2.9.tar.gz) = e8e5a1b3fdad448a59ac3bba451ebdacc757f2c59b779a5f7ed20c19aee79c323c48bf723f5be684eab522ec3ebae60defe5bf426d1cd6701b4efdc79669d72e +SHA512 (crypto_policies-1.2.10.tar.gz) = b494632cd15a5929b85ab509f2fce2887b4f8d821f868e2553b9a67ff09e5103bc976304dee04b6da63b73def6177174a47d5f4dffd49b4ded594ce2df05a337 SHA512 (firewall-1.4.4.tar.gz) = 19a04369298e80accfaa57e9ca5c2c34b53e05ea78a1cecac46548d6440e54e19f0978742e5852aaf4516de4ccdfa22bb547f6623f05888cdef22df99155cab9 -SHA512 (ha_cluster-1.9.2.tar.gz) = c491aae3e99eae0e4f71248ab2f21de0da18c371649d8421d663cd49aea47b845e7adea19c02d5728ca20cf9299eaed8783124abed617d865601ee373153f239 -SHA512 (journald-1.0.3.tar.gz) = b7d3a33c16ee8aec11047f34d7d788c6bceb9fe6ef3b8a7d75eb9c461d72e40acb0c5c1e1f1cbe720e0fc530bf609789724295cddb7790eeaee7a850d09d6574 +SHA512 (ha_cluster-1.9.3.tar.gz) = 478fc854de7db1b3069af7f939b4ccf1d8404639d400c30972192f4d2cd9dd83371ba7423651b6615c95d1af9dcfaf641564fc85afcfa2a058f4fc0bb74bcca0 +SHA512 (journald-1.0.4.tar.gz) = 6efb7e24c2b38632e847e7e04c7135b4c8bcfd96dfb8dae5f6289001e19d82465c5d0c4c7479175d814dc94dd025323590cac0eea6ff5658ace69536dd211281 SHA512 (kdump-1.2.9.tar.gz) = b33927fd777a012d949a029ae827b914b26fdafdce8b92475d91f98e0ab445dc30461a1a5d964ec404f5e004e9c203923bdd654af39cae0aa46be70fa82c5935 -SHA512 (kernel_settings-1.1.15.tar.gz) = dd74ce866357958a477dbbb84f95677224049135d5d245aeab979fde1da194b07d205a189526e3f0cb39e9c97b526e50eb46e19322289183f3b698fd02c8b4b1 -SHA512 (logging-1.11.7.tar.gz) = 4628b0fe6799ed0cff1cabfef3492cebbd55f99cfceb2b2f0db1b47408d2bf497b309024f19522495e5f9562d88a0117839b8bb4d57a56b41a780ee06b6a4280 -SHA512 (metrics-1.8.4.tar.gz) = 74a4ddc1133c437ea3fb49388bf73aef0d4a12ecf81a42aa5cc2f4bb85d1c984ec0d18db470f6fb32645d8542507876fee15c96486d21467eeeba91e57fd06df +SHA512 (kernel_settings-1.1.16.tar.gz) = a8731a693ccf818b582329d82a7b7de7659cad3552be462debb747ab598d55511d8928611983a5739be27d550e2560a300d02e50cadf7c2103723ef2f7489c77 +SHA512 (logging-1.11.8.tar.gz) = 926d200a9b28d7b304062b71c2ccfe089f851921c0e002fb8096f1680759138ee7d7fd0c9cb8fefef4080f08e4979f1fdf0015f47679dc0e22c4d157b190693a +SHA512 (metrics-1.8.5.tar.gz) = 6ddef8f4693507175332a5a380f8af693d60912c710d01c3db67befb7d5395a94d4f15eabbc24fef2621a0088bc808fcfe280149adf3de9c62ae371f75cd1ec9 SHA512 (nbde_client-1.2.13.tar.gz) = b35544ee32a6e0aa54985fbc1225f7e7ba124ecb89065545716a58edf6c7c54ef466aed2d3330a453720d3b4336195814abe831c175c10505ce134b43a202ab6 -SHA512 (nbde_server-1.3.5.tar.gz) = 8e4730ea02ed3c85c2b2530b627cc0600251961556cd1c89872db6ca6420eec6aee6d016190fa99d4d1ebe118af3ea017d9c1646ed430ca9fa8a07f0839c1658 +SHA512 (nbde_server-1.3.6.tar.gz) = 45a014ec7ecc7095fd4445898e40f606e8231fcc7abf80469ab0d52a926686693ce5fd1c65ffea1aff3545b336067d866aeef75abe5e033fd4c8dafe8aa52602 SHA512 (network-1.11.4.tar.gz) = 0984041cf312879a2c65690a481f87a5ced61df4e19e0c4775346461851e4a96753ebbde048ca84083b648ff09fea5bdb85e1a65d065cd03f7d1561d9debc312 -SHA512 (podman-1.1.5.tar.gz) = dfe6e362f7d151eb8d92fe64bd67980d20d019475d3872d1ca353ef27acec1d055d1d53baf0e7f081b11077219db6405367f514092aa3687308756757bb41fd4 -SHA512 (postfix-1.3.6.tar.gz) = 8409adb897e56663ebb5d149f539dfebd70135812fd164b3fa55af56b9601015d0f288448eb38e538b77a71e921719f956ddac9d3d95a46acd382560ac72752e -SHA512 (postgresql-1.0.3.tar.gz) = 8aa19cada6a9ac067cd070faee046106a3c93aef3a439973ffa7531442691ecef4150fe3b39684d60ba1f3b5f34319b67cba4df204677b358f34f046128c3813 -SHA512 (rhc-1.1.2.tar.gz) = 18a59153859fca40c571acd114e8e94800cc784a7ff15e3867c2842e0006a66b525e6894954e0d38f86f35debfe768fd0ce6daa9435f80136c07ac8a786f986f +SHA512 (podman-1.1.6.tar.gz) = b56f1c029bb5b6d62bd61edfaf83e1225ba0ba4421218489e09f6fadadb374ca023d47d546ecce1d414803237de547500bdb645872f738557cd1f0a48274fe4b +SHA512 (postfix-1.3.7.tar.gz) = 61153bf1e66b8e486a2356104d3c166ffa577be8e4cb57a829408098d9e3166a8c79cbc5b7c1d302996d7e653d53b976a0a87b0686b84880e6d63627c385f3a9 +SHA512 (postgresql-1.0.4.tar.gz) = 84afd59d6460094e9ff9860b342cadc3f237c21091d583c61e15162e251286cae8592b078125a38ba05fceded6dfe44c81568e5fed54f0c463b3312fb24967a8 +SHA512 (rhc-1.1.3.tar.gz) = 100e02a52b1786b858e99ac7305c6aff61634d564067d009718662c6a554fe1ea9125e45c56c7d671b8817168f43190453f5d89b3b931e31374888e9d227fd42 SHA512 (selinux-1.5.9.tar.gz) = df9e2c7594ae3b437b8eb2d0a83e3c0d996323af2f5d6509a01a1297fcf18b8f779cb8975c7cf3c2c8fbd6a391b6b8a2206cc38d16690bdb6c29c7187f1364c8 -SHA512 (ssh-1.1.15.tar.gz) = 0901382d0c5859a797fb4d0191a50bf3cec36bfe141cdbc0a03bfaec0c565d180538b51d21c2f7cf763f788315a9392206a084e7cd026b77a7aa437cddefcf7d -SHA512 (storage-1.9.8.tar.gz) = c43e8aa29b8d44409c8409c08c87af80650928bb56497f6b04a9b6e0984c110a333e2c315ca640bfa20092216aa7d650b460681603226fe0857366016fab48c7 +SHA512 (ssh-1.1.16.tar.gz) = bb947bb8ec2bd07864598588e9b6a032a222f3564f0960439ade8b7284efaedfb7ea6e7931fb9fbc67dc54865391a69a94c95beaa645b9f5f750971108ca49d2 +SHA512 (storage-1.10.0.tar.gz) = e0e7edfc514eebc082c21ba0f7917aa17590f19095be8f6676fe9d2936e601e410071d4e45f1d4e7abcbadf6872d6afcb889fbae8f7a4b14e5b147f30c0509eb SHA512 (timesync-1.7.5.tar.gz) = 6a7ff71a6152e74706836ec32671f1d1dff46b675816e584aa2761acbb88874f6e62d892a74555c3534ba7851a114bef30a18f79620ec707d0829c46c3ce8a33 -SHA512 (tlog-1.2.14.tar.gz) = 05b0e23c578b159895a41ec662e0a6a02654bfb966f335a698071635503caa0f27b682fac15aa1948933e2e039eebf1511b527479d92091c5a8edc6d66a19251 -SHA512 (vpn-1.5.6.tar.gz) = f4c1fb07d92f9b27fbb846cdce2bb5e138f4e13a9c9bf3495947c8addc4b4fe0a011f0ee6062bff10d5281fbacd7235a0d91a99656d9fa76c5519245db2a7d95 +SHA512 (tlog-1.2.15.tar.gz) = 1ba847c96c58d6c82e6a6bc18f95af0f6749f7b9bb3cdfbeb19175ceef5135f8cdf5db796a6a2f8b09c712514674fe10d0d4c85c8b670d123f88723a6bf193ca +SHA512 (vpn-1.5.7.tar.gz) = c2cc5b21d455de6fbff47ba171326b142e0b04d597a03fc1399338c77d154ec82ca1c604db2ac0ce257c9fa05374e2e472ffff97db7dc04a4355f2a8299e81a2