From 771bee8a1958a11d332de261b19d8894ae88d193 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 8 Nov 2023 17:02:49 +0300 Subject: [PATCH] import rhel-system-roles-1.22.0-2.el9 --- .gitignore | 59 +- .rhel-system-roles.metadata | 59 +- ...stdin-for-password-and-do-not-log-pa.patch | 127 ++ SOURCES/CHANGELOG.md | 63 +- SOURCES/ansible-packaging.inc | 21 + SOURCES/extrasources.inc | 12 +- SOURCES/redhat_subscription.py | 1187 ----------------- SOURCES/vendoring-build.inc | 104 ++ SOURCES/vendoring-prep.inc | 12 + SPECS/linux-system-roles.spec | 418 +++--- 10 files changed, 614 insertions(+), 1448 deletions(-) create mode 100644 SOURCES/0001-fix-use-command-stdin-for-password-and-do-not-log-pa.patch create mode 100644 SOURCES/ansible-packaging.inc delete mode 100644 SOURCES/redhat_subscription.py create mode 100644 SOURCES/vendoring-build.inc create mode 100644 SOURCES/vendoring-prep.inc diff --git a/.gitignore b/.gitignore index ac4edb7..001b2bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1,31 @@ -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.1.3.tar.gz +SOURCES/ansible-posix-1.5.4.tar.gz +SOURCES/ansible-sshd-v0.19.0.tar.gz +SOURCES/auto-maintenance-e010c878833e363195dd707d1334ff48a254b092.tar.gz +SOURCES/certificate-1.2.1.tar.gz +SOURCES/cockpit-1.4.7.tar.gz +SOURCES/community-general-7.3.0.tar.gz +SOURCES/containers-podman-1.10.3.tar.gz +SOURCES/crypto_policies-1.2.11.tar.gz +SOURCES/firewall-1.6.3.tar.gz +SOURCES/ha_cluster-1.10.0.tar.gz +SOURCES/journald-1.0.5.tar.gz +SOURCES/kdump-1.3.6.tar.gz +SOURCES/kernel_settings-1.1.17.tar.gz +SOURCES/keylime_server-1.0.0.tar.gz +SOURCES/logging-1.11.9.tar.gz +SOURCES/metrics-1.8.6.tar.gz +SOURCES/nbde_client-1.2.14.tar.gz +SOURCES/nbde_server-1.3.8.tar.gz +SOURCES/network-1.13.1.tar.gz +SOURCES/podman-1.3.2.tar.gz +SOURCES/postfix-1.3.8.tar.gz +SOURCES/postgresql-1.1.0.tar.gz +SOURCES/rhc-1.2.4.tar.gz +SOURCES/selinux-1.6.1.tar.gz +SOURCES/ssh-1.2.1.tar.gz +SOURCES/storage-1.12.3.tar.gz +SOURCES/systemd-1.0.1.tar.gz +SOURCES/timesync-1.7.6.tar.gz +SOURCES/tlog-1.2.16.tar.gz +SOURCES/vpn-1.5.8.tar.gz diff --git a/.rhel-system-roles.metadata b/.rhel-system-roles.metadata index 2c4f09a..03291d4 100644 --- a/.rhel-system-roles.metadata +++ b/.rhel-system-roles.metadata @@ -1,28 +1,31 @@ -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 +4ed72d2549af3a2bf5232944dcd84c4203ec1f49 SOURCES/ad_integration-1.1.3.tar.gz +da646eb9ba655f1693cc950ecb5c24af39ee1af6 SOURCES/ansible-posix-1.5.4.tar.gz +edcfa5243b2e74c50ab8fd17f514bbc9df693c06 SOURCES/ansible-sshd-v0.19.0.tar.gz +7b34305ca31a8df71f3ecec3410c7c4d262201bd SOURCES/auto-maintenance-e010c878833e363195dd707d1334ff48a254b092.tar.gz +4483962040f0c29fa9c80950dc403ce7e9f17ed7 SOURCES/certificate-1.2.1.tar.gz +4ed2794a781e7976ff2a0b4c6abbf008859ef982 SOURCES/cockpit-1.4.7.tar.gz +ee7868c57b3d1ce170b61a1d42c840ba1428aeac SOURCES/community-general-7.3.0.tar.gz +711423c6503c1e137d7c38b6a0718e5768f40d21 SOURCES/containers-podman-1.10.3.tar.gz +aee5eb307f5a40a8a222a0dd7713b230bc3324a7 SOURCES/crypto_policies-1.2.11.tar.gz +81ac41f0c7d06dbb92d70b8d9a0a0b0a6474411c SOURCES/firewall-1.6.3.tar.gz +aa11011e00fe8a86999688149d60f5d0a4ed5cbf SOURCES/ha_cluster-1.10.0.tar.gz +88e721b5d804f00e7b044310d47b2dd40ac83f8f SOURCES/journald-1.0.5.tar.gz +64680ec0f3ea03fc5c0a5792ceeaa193d6154fdd SOURCES/kdump-1.3.6.tar.gz +43338d3ffdc79961564504822a84462cefa8ff5a SOURCES/kernel_settings-1.1.17.tar.gz +81b0e4e1f71f01a008181494eefc542506cd3823 SOURCES/keylime_server-1.0.0.tar.gz +0963ecef1330048c25bb9a778b5ac15c24e77df2 SOURCES/logging-1.11.9.tar.gz +af61299d39b4a7d5e37507a898ddba55e3f053d6 SOURCES/metrics-1.8.6.tar.gz +b8c7ff7dadbd84aeb13e94c4be3be0f8ee9549cd SOURCES/nbde_client-1.2.14.tar.gz +a5d2a5afd45447edb17f6a9615eabb80501e61f3 SOURCES/nbde_server-1.3.8.tar.gz +fe9426eaf3e7a5a31ebe5707e4a17770bca7a6b6 SOURCES/network-1.13.1.tar.gz +8b49515b4c5d8b1f5e06be6c7fdeff7ab622c495 SOURCES/podman-1.3.2.tar.gz +b91070ba6fa7b4a9072aa2d1a2ef4b169aab0f00 SOURCES/postfix-1.3.8.tar.gz +504cde6540ff1b5527b2ddf9aa90a95e29d7ffc3 SOURCES/postgresql-1.1.0.tar.gz +a6097168bd1b54a46be8b5f4adfdab9b5ec8ddb5 SOURCES/rhc-1.2.4.tar.gz +bb2a5e711233e527d0a11914bd566f47a2cfe9e6 SOURCES/selinux-1.6.1.tar.gz +c03dbda563ec7d3c2ae2c7bfd6aab88c6c19fbac SOURCES/ssh-1.2.1.tar.gz +84085e0f750181aee340e02258fd5888d563698e SOURCES/storage-1.12.3.tar.gz +1c7ac80df7288f7d3469e376316305eadd2dc2dc SOURCES/systemd-1.0.1.tar.gz +e4fe253906ffd7ce2ecca71a63a0e96e5f562e0c SOURCES/timesync-1.7.6.tar.gz +544d0591a0ae73b73c1ab5bc280cdc8d5598f322 SOURCES/tlog-1.2.16.tar.gz +1d959b0b5f6bd261d392b0740fd86915c7b35c17 SOURCES/vpn-1.5.8.tar.gz diff --git a/SOURCES/0001-fix-use-command-stdin-for-password-and-do-not-log-pa.patch b/SOURCES/0001-fix-use-command-stdin-for-password-and-do-not-log-pa.patch new file mode 100644 index 0000000..bba4a2b --- /dev/null +++ b/SOURCES/0001-fix-use-command-stdin-for-password-and-do-not-log-pa.patch @@ -0,0 +1,127 @@ +From 1931ebccaa146bd6ee8365c664ab62d294adaa31 Mon Sep 17 00:00:00 2001 +From: Rich Megginson +Date: Fri, 18 Aug 2023 12:35:44 -0600 +Subject: [PATCH] fix: use command stdin for password, and do not log password + +Cause: The code was constructing the realm join command to be passed +via the shell module, including piping the password into the command, +and was showing the command, including the password, when using +check mode. + +Consequence: The clear text password was available in the logs when +using check mode. + +Fix: Use command with stdin for the password instead of shell. The +password is not part of the command. command with stdin is more +secure than using shell. The debug output has been changed to +show the command with the `ad_integration_join_parameters` removed, +because we cannot know if those parameters contain data which should +not be logged. Those parameters will still be passed to the actual +realm join command. + +Result: The password is not logged. The role is more secure. + +Signed-off-by: Rich Megginson +--- + tasks/main.yml | 57 ++++++++++++++++++++++++++++---------------------- + 1 file changed, 32 insertions(+), 25 deletions(-) + +diff --git a/tasks/main.yml b/tasks/main.yml +index fe2602e..265c6fe 100644 +--- a/tasks/main.yml ++++ b/tasks/main.yml +@@ -3,8 +3,7 @@ + - name: Ensure that mandatory variable ad_integration_realm is available + fail: + msg: Variable ad_integration_realm must be provided! +- when: +- - not ad_integration_realm ++ when: not ad_integration_realm + + - name: Assume managing timesync if timesource is set + set_fact: +@@ -26,8 +25,7 @@ + - name: Assume managing crypto policies if allow_rc4_crypto is set + set_fact: + ad_integration_manage_crypto_policies: true +- when: +- - ad_integration_allow_rc4_crypto | bool ++ when: ad_integration_allow_rc4_crypto | bool + + - name: Ensure manage_crypt_policies is set with crypto_allow_rc4 + fail: +@@ -141,41 +139,50 @@ + + - name: Build Command - Join to a specific Domain Controller + set_fact: +- __ad_integration_join_command: | +- set -euo pipefail +- echo {{ ad_integration_password | quote }} | realm join -U \ +- {{ ad_integration_user | quote }} --membership-software \ +- {{ ad_integration_membership_software | quote }} \ +- {{ ad_integration_join_parameters }} \ +- {{ ad_integration_join_to_dc | quote }} ++ __ad_integration_join_command: >- ++ realm join -U {{ ad_integration_user | quote }} --membership-software ++ {{ ad_integration_membership_software | quote }} ++ {{ ad_integration_join_parameters }} ++ {{ ad_integration_join_to_dc | quote }} ++ __ad_integration_debug_command: >- ++ realm join -U {{ ad_integration_user | quote }} --membership-software ++ {{ ad_integration_membership_software | quote }} ++ {{ ad_integration_join_to_dc | quote }} + no_log: true +- when: +- - ad_integration_join_to_dc is not none ++ when: ad_integration_join_to_dc is not none + + - name: Build Join Command - Perform discovery-based realm join operation + set_fact: +- __ad_integration_join_command: | +- set -euo pipefail +- echo {{ ad_integration_password | quote }} | realm join -U \ +- {{ ad_integration_user | quote }} --membership-software \ +- {{ ad_integration_membership_software | quote }} \ +- {{ ad_integration_join_parameters }} \ +- {{ ad_integration_realm | quote }} ++ __ad_integration_join_command: >- ++ realm join -U {{ ad_integration_user | quote }} --membership-software ++ {{ ad_integration_membership_software | quote }} ++ {{ ad_integration_join_parameters }} ++ {{ ad_integration_realm | quote }} ++ __ad_integration_debug_command: >- ++ realm join -U {{ ad_integration_user | quote }} --membership-software ++ {{ ad_integration_membership_software | quote }} ++ {{ ad_integration_realm | quote }} + no_log: true +- when: +- - ad_integration_join_to_dc is none ++ when: ad_integration_join_to_dc is none + + - name: Show the join command for debug + debug: +- msg: "Would run: '{{ __ad_integration_join_command }}'" ++ msg: ++ - >- ++ Would run the following command. Note that ++ ad_integration_join_parameters have been removed for security purposes, ++ the role will pass them to the actual realm join command when running ++ without check mode. ++ - "{{ __ad_integration_debug_command }}" + when: + - ad_integration_join_to_dc == __ad_integration_sample_dc + or ad_integration_realm == __ad_integration_sample_realm + or ansible_check_mode + + - name: Run realm join command +- # noqa command-instead-of-shell +- shell: "{{ __ad_integration_join_command }}" ++ command: "{{ __ad_integration_join_command }}" ++ args: ++ stdin: "{{ ad_integration_password }}" + no_log: true + when: + - ad_integration_join_to_dc != __ad_integration_sample_dc +-- +2.41.0 + diff --git a/SOURCES/CHANGELOG.md b/SOURCES/CHANGELOG.md index be6b338..07fce60 100644 --- a/SOURCES/CHANGELOG.md +++ b/SOURCES/CHANGELOG.md @@ -1,17 +1,58 @@ Changelog ========= -[1.21.2] - 2023-06-12 ----------------------------- - -### New Features - -- none - -### Bug Fixes - -- [rhc - activation key registration fails if system is already registered](https://bugzilla.redhat.com/show_bug.cgi?id=2214282) -- [rhc - system role does not apply Insights tags](https://bugzilla.redhat.com/show_bug.cgi?id=2214284) +[1.22.0] - 2023-08-15 +---------------------------- + +### New Features + +- [ALL - fingerprint in config files managed by roles](https://bugzilla.redhat.com/show_bug.cgi?id=2185062) +- [ad_integration - add ad_integration_force_rejoin](https://bugzilla.redhat.com/show_bug.cgi?id=2186253) +- [certificate - add mode parameter to change permissions for cert files](https://bugzilla.redhat.com/show_bug.cgi?id=2180902) +- [firewall - missing module in linux-system-roles.firewall to create an ipset](https://bugzilla.redhat.com/show_bug.cgi?id=2229802) +- [firewall - should have option to disable conflicting services](https://bugzilla.redhat.com/show_bug.cgi?id=2222761) +- [ha_cluster - Add possibility to load SBD watchdog kernel modules](https://bugzilla.redhat.com/show_bug.cgi?id=2185067) +- [ha_cluster - support for resource and operation defaults](https://bugzilla.redhat.com/show_bug.cgi?id=2185065) +- [kdump - support auto_reset_crashkernel, dracut_args, deprecate /etc/sysconfig/kdump](https://bugzilla.redhat.com/show_bug.cgi?id=2211187) +- [keylime_server - New role - system role for managing keylime servers](https://bugzilla.redhat.com/show_bug.cgi?id=2224385) +- [network - Support no-aaaa DNS option](https://bugzilla.redhat.com/show_bug.cgi?id=2218592) +- [network - Support configuring auto-dns setting](https://bugzilla.redhat.com/show_bug.cgi?id=2211194) +- [podman - support quadlet units](https://bugzilla.redhat.com/show_bug.cgi?id=2179455) +- [podman - allow container networking configuration](https://bugzilla.redhat.com/show_bug.cgi?id=2161712) +- [podman - support for healthchecks and healthcheck actions](https://bugzilla.redhat.com/show_bug.cgi?id=2179457) +- [podman - use getsubids to look for subuid, subgid for IdM support](https://issues.redhat.com/browse/RHEL-865) +- [podman - allow to not pull images, continue if image pull fails](https://issues.redhat.com/browse/RHEL-857) +- [postgresql - New role - system role for PostgreSQL management](https://bugzilla.redhat.com/show_bug.cgi?id=2151373) +- [rhc - implement rhc_proxy.scheme](https://bugzilla.redhat.com/show_bug.cgi?id=2211748) +- [selinux - use restorecon -T 0 on supported platforms](https://bugzilla.redhat.com/show_bug.cgi?id=2179460) +- [ssh - add ssh_backup option with default true](https://bugzilla.redhat.com/show_bug.cgi?id=2216753) +- [storage - mounted devices that are in use cannot be resized](https://bugzilla.redhat.com/show_bug.cgi?id=2168692) +- [storage - support configuring the stripe size for RAID LVM volumes](https://bugzilla.redhat.com/show_bug.cgi?id=2181656) +- [storage - user-specified mount point owner and permissions](https://bugzilla.redhat.com/show_bug.cgi?id=2181657) +- [systemd - New role - system role for managing systemd units](https://bugzilla.redhat.com/show_bug.cgi?id=2224384) + +### Bug Fixes + +- [ALL - facts being gathered unnecessarily](https://bugzilla.redhat.com/show_bug.cgi?id=2223032) +- [ad_integration - leaks credentials when in check_mode](https://bugzilla.redhat.com/show_bug.cgi?id=2232758) +- [certificate - does not re-issue after updating key_size](https://bugzilla.redhat.com/show_bug.cgi?id=2224138) +- [firewall - fix: reload on resetting to defaults](https://bugzilla.redhat.com/show_bug.cgi?id=2223764) +- [firewall - Check mode fails with replacing previous rules](https://issues.redhat.com/browse/RHEL-898) +- [firewall - Check mode fails when creating new firewall service](https://bugzilla.redhat.com/show_bug.cgi?id=2222428) +- [firewall - Ansible RHEL firewall system role not idempotent when configuring the interface using the role in rhel9](https://issues.redhat.com/browse/RHEL-885) +- [firewall - Don't install python(3)-firewall it's a dependency of firewalld](https://bugzilla.redhat.com/show_bug.cgi?id=2216520) +- [firewall - fix: files: overwrite firewalld.conf on previous replaced](https://issues.redhat.com/browse/RHEL-1495) +- [kdump - use failure_action instead of default on EL9 and later](https://issues.redhat.com/browse/RHEL-906) +- [kdump - "Write new authorized_keys if needed" task idempotency issues](https://bugzilla.redhat.com/show_bug.cgi?id=2232241) +- [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=2232231) +- [kdump - fix: ensure .ssh directory exists for kdump_ssh_user on kdump_ssh_server](https://issues.redhat.com/browse/RHEL-1397) +- [kdump - fix: Ensure authorized_keys management works with multiple hosts](https://issues.redhat.com/browse/RHEL-1499) +- [podman - Podman system role: Unable to use podman_registries_conf to set unqualified-search-registries](https://bugzilla.redhat.com/show_bug.cgi?id=2211984) +- [rhc - system role does not apply Insights tags](https://bugzilla.redhat.com/show_bug.cgi?id=2209200) +- [storage - RAID volume pre cleanup - remove existing data from member disks as needed before creation](https://bugzilla.redhat.com/show_bug.cgi?id=2224090) +- [storage - Cannot set chunk size for RAID: Unsupported parameters for (blivet) module: pools.raid_chunk_size](https://bugzilla.redhat.com/show_bug.cgi?id=2193058) +- [storage - fix: use stat.pw_name, stat.gr_name instead of owner, group](https://issues.redhat.com/browse/RHEL-1497) +- [tlog - use the proxy provider - the files provider is deprecated in sssd](https://bugzilla.redhat.com/show_bug.cgi?id=2179458) [1.21.1] - 2023-03-16 ---------------------------- diff --git a/SOURCES/ansible-packaging.inc b/SOURCES/ansible-packaging.inc new file mode 100644 index 0000000..7cdb972 --- /dev/null +++ b/SOURCES/ansible-packaging.inc @@ -0,0 +1,21 @@ +# Helper macros originally from macros.ansible by Igor Raits +# 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 diff --git a/SOURCES/extrasources.inc b/SOURCES/extrasources.inc index d2d3175..8ee7e1f 100644 --- 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-7.3.0.tar.gz +Source902: https://galaxy.ansible.com/download/containers-podman-1.10.3.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)) = 7.3.0 +Provides: bundled(ansible-collection(containers.podman)) = 1.10.3 Source996: CHANGELOG.rst Source998: collection_readme.sh diff --git a/SOURCES/redhat_subscription.py b/SOURCES/redhat_subscription.py deleted file mode 100644 index 2995e5a..0000000 --- a/SOURCES/redhat_subscription.py +++ /dev/null @@ -1,1187 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- - -# Copyright (c) James Laska (jlaska@redhat.com) -# -# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) -# SPDX-License-Identifier: GPL-3.0-or-later - -from __future__ import absolute_import, division, print_function -__metaclass__ = type - - -DOCUMENTATION = ''' ---- -module: redhat_subscription -short_description: Manage registration and subscriptions to RHSM using C(subscription-manager) -description: - - Manage registration and subscription to the Red Hat Subscription Management entitlement platform using the C(subscription-manager) command, - registering using D-Bus if possible. -author: "Barnaby Court (@barnabycourt)" -notes: - - In order to register a system, subscription-manager requires either a username and password, or an activationkey and an Organization ID. - - Since 2.5 values for I(server_hostname), I(server_insecure), I(rhsm_baseurl), - I(server_proxy_hostname), I(server_proxy_port), I(server_proxy_user) and - I(server_proxy_password) are no longer taken from the C(/etc/rhsm/rhsm.conf) - config file and default to None. -requirements: - - subscription-manager - - Optionally the C(dbus) Python library; this is usually included in the OS - as it is used by C(subscription-manager). -extends_documentation_fragment: - - community.general.attributes -attributes: - check_mode: - support: none - diff_mode: - support: none -options: - state: - description: - - whether to register and subscribe (C(present)), or unregister (C(absent)) a system - choices: [ "present", "absent" ] - default: "present" - type: str - username: - description: - - access.redhat.com or Red Hat Satellite or Katello username - type: str - password: - description: - - access.redhat.com or Red Hat Satellite or Katello password - type: str - token: - description: - - sso.redhat.com API access token. - type: str - version_added: 6.3.0 - server_hostname: - description: - - Specify an alternative Red Hat Subscription Management or Red Hat Satellite or Katello server - type: str - server_insecure: - description: - - Enable or disable https server certificate verification when connecting to C(server_hostname) - type: str - server_prefix: - description: - - Specify the prefix when registering to the Red Hat Subscription Management or Red Hat Satellite or Katello server. - type: str - version_added: 3.3.0 - server_port: - description: - - Specify the port when registering to the Red Hat Subscription Management or Red Hat Satellite or Katello server. - type: str - version_added: 3.3.0 - rhsm_baseurl: - description: - - Specify CDN baseurl - type: str - rhsm_repo_ca_cert: - description: - - Specify an alternative location for a CA certificate for CDN - type: str - server_proxy_hostname: - description: - - Specify an HTTP proxy hostname. - type: str - server_proxy_scheme: - description: - - Specify an HTTP proxy scheme, for example C(http) or C(https). - type: str - version_added: 6.2.0 - server_proxy_port: - description: - - Specify an HTTP proxy port. - type: str - server_proxy_user: - description: - - Specify a user for HTTP proxy with basic authentication - type: str - server_proxy_password: - description: - - Specify a password for HTTP proxy with basic authentication - type: str - auto_attach: - description: - - Upon successful registration, auto-consume available subscriptions - - Added in favor of deprecated autosubscribe in 2.5. - type: bool - aliases: [autosubscribe] - activationkey: - description: - - supply an activation key for use with registration - type: str - org_id: - description: - - Organization ID to use in conjunction with activationkey - type: str - environment: - description: - - Register with a specific environment in the destination org. Used with Red Hat Satellite or Katello - type: str - pool: - description: - - | - Specify a subscription pool name to consume. Regular expressions accepted. Use I(pool_ids) instead if - possible, as it is much faster. Mutually exclusive with I(pool_ids). - default: '^$' - type: str - pool_ids: - description: - - | - Specify subscription pool IDs to consume. Prefer over I(pool) when possible as it is much faster. - A pool ID may be specified as a C(string) - just the pool ID (ex. C(0123456789abcdef0123456789abcdef)), - or as a C(dict) with the pool ID as the key, and a quantity as the value (ex. - C(0123456789abcdef0123456789abcdef: 2). If the quantity is provided, it is used to consume multiple - entitlements from a pool (the pool must support this). Mutually exclusive with I(pool). - default: [] - type: list - elements: raw - consumer_type: - description: - - The type of unit to register, defaults to system - type: str - consumer_name: - description: - - Name of the system to register, defaults to the hostname - type: str - consumer_id: - description: - - | - References an existing consumer ID to resume using a previous registration - for this system. If the system's identity certificate is lost or corrupted, - this option allows it to resume using its previous identity and subscriptions. - The default is to not specify a consumer ID so a new ID is created. - type: str - force_register: - description: - - Register the system even if it is already registered - type: bool - default: false - release: - description: - - Set a release version - type: str - syspurpose: - description: - - Set syspurpose attributes in file C(/etc/rhsm/syspurpose/syspurpose.json) - and synchronize these attributes with RHSM server. Syspurpose attributes help attach - the most appropriate subscriptions to the system automatically. When C(syspurpose.json) file - already contains some attributes, then new attributes overwrite existing attributes. - When some attribute is not listed in the new list of attributes, the existing - attribute will be removed from C(syspurpose.json) file. Unknown attributes are ignored. - type: dict - suboptions: - usage: - description: Syspurpose attribute usage - type: str - role: - description: Syspurpose attribute role - type: str - service_level_agreement: - description: Syspurpose attribute service_level_agreement - type: str - addons: - description: Syspurpose attribute addons - type: list - elements: str - sync: - description: - - When this option is true, then syspurpose attributes are synchronized with - RHSM server immediately. When this option is false, then syspurpose attributes - will be synchronized with RHSM server by rhsmcertd daemon. - type: bool - default: false -''' - -EXAMPLES = ''' -- name: Register as user (joe_user) with password (somepass) and auto-subscribe to available content. - community.general.redhat_subscription: - state: present - username: joe_user - password: somepass - auto_attach: true - -- name: Same as above but subscribe to a specific pool by ID. - community.general.redhat_subscription: - state: present - username: joe_user - password: somepass - pool_ids: 0123456789abcdef0123456789abcdef - -- name: Register and subscribe to multiple pools. - community.general.redhat_subscription: - state: present - username: joe_user - password: somepass - pool_ids: - - 0123456789abcdef0123456789abcdef - - 1123456789abcdef0123456789abcdef - -- name: Same as above but consume multiple entitlements. - community.general.redhat_subscription: - state: present - username: joe_user - password: somepass - pool_ids: - - 0123456789abcdef0123456789abcdef: 2 - - 1123456789abcdef0123456789abcdef: 4 - -- name: Register and pull existing system data. - community.general.redhat_subscription: - state: present - username: joe_user - password: somepass - consumer_id: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx - -- name: Register with activationkey and consume subscriptions matching Red Hat Enterprise Server or Red Hat Virtualization - community.general.redhat_subscription: - state: present - activationkey: 1-222333444 - org_id: 222333444 - pool: '^(Red Hat Enterprise Server|Red Hat Virtualization)$' - -- name: Update the consumed subscriptions from the previous example (remove Red Hat Virtualization subscription) - community.general.redhat_subscription: - state: present - activationkey: 1-222333444 - org_id: 222333444 - pool: '^Red Hat Enterprise Server$' - -- name: Register as user credentials into given environment (against Red Hat Satellite or Katello), and auto-subscribe. - community.general.redhat_subscription: - state: present - username: joe_user - password: somepass - environment: Library - auto_attach: true - -- name: Register as user (joe_user) with password (somepass) and a specific release - community.general.redhat_subscription: - state: present - username: joe_user - password: somepass - release: 7.4 - -- name: Register as user (joe_user) with password (somepass), set syspurpose attributes and synchronize them with server - community.general.redhat_subscription: - state: present - username: joe_user - password: somepass - auto_attach: true - syspurpose: - usage: "Production" - role: "Red Hat Enterprise Server" - service_level_agreement: "Premium" - addons: - - addon1 - - addon2 - sync: true -''' - -RETURN = ''' -subscribed_pool_ids: - description: List of pool IDs to which system is now subscribed - returned: success - type: dict - sample: { - "8a85f9815ab905d3015ab928c7005de4": "1" - } -''' - -from os.path import isfile -from os import unlink -import re -import shutil -import tempfile -import json - -from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.common.text.converters import to_native -from ansible.module_utils.six.moves import configparser -from ansible.module_utils import distro - - -SUBMAN_CMD = None - - -class RegistrationBase(object): - - REDHAT_REPO = "/etc/yum.repos.d/redhat.repo" - - def __init__(self, module, username=None, password=None, token=None): - self.module = module - self.username = username - self.password = password - self.token = token - - def configure(self): - raise NotImplementedError("Must be implemented by a sub-class") - - def enable(self): - # Remove any existing redhat.repo - if isfile(self.REDHAT_REPO): - unlink(self.REDHAT_REPO) - - def register(self): - raise NotImplementedError("Must be implemented by a sub-class") - - def unregister(self): - raise NotImplementedError("Must be implemented by a sub-class") - - def unsubscribe(self): - raise NotImplementedError("Must be implemented by a sub-class") - - def update_plugin_conf(self, plugin, enabled=True): - plugin_conf = '/etc/yum/pluginconf.d/%s.conf' % plugin - - if isfile(plugin_conf): - tmpfd, tmpfile = tempfile.mkstemp() - shutil.copy2(plugin_conf, tmpfile) - cfg = configparser.ConfigParser() - cfg.read([tmpfile]) - - if enabled: - cfg.set('main', 'enabled', '1') - else: - cfg.set('main', 'enabled', '0') - - fd = open(tmpfile, 'w+') - cfg.write(fd) - fd.close() - self.module.atomic_move(tmpfile, plugin_conf) - - def subscribe(self, **kwargs): - raise NotImplementedError("Must be implemented by a sub-class") - - -class Rhsm(RegistrationBase): - def __init__(self, module, username=None, password=None, token=None): - RegistrationBase.__init__(self, module, username, password, token) - self.module = module - - def enable(self): - ''' - Enable the system to receive updates from subscription-manager. - This involves updating affected yum plugins and removing any - conflicting yum repositories. - ''' - RegistrationBase.enable(self) - self.update_plugin_conf('rhnplugin', False) - self.update_plugin_conf('subscription-manager', True) - - def configure(self, **kwargs): - ''' - Configure the system as directed for registration with RHSM - Raises: - * Exception - if error occurs while running command - ''' - - args = [SUBMAN_CMD, 'config'] - - # Pass supplied **kwargs as parameters to subscription-manager. Ignore - # non-configuration parameters and replace '_' with '.'. For example, - # 'server_hostname' becomes '--server.hostname'. - options = [] - for k, v in sorted(kwargs.items()): - if re.search(r'^(server|rhsm)_', k) and v is not None: - options.append('--%s=%s' % (k.replace('_', '.', 1), v)) - - # When there is nothing to configure, then it is not necessary - # to run config command, because it only returns current - # content of current configuration file - if len(options) == 0: - return - - args.extend(options) - - self.module.run_command(args, check_rc=True) - - @property - def is_registered(self): - ''' - Determine whether the current system - Returns: - * Boolean - whether the current system is currently registered to - RHSM. - ''' - - args = [SUBMAN_CMD, 'identity'] - rc, stdout, stderr = self.module.run_command(args, check_rc=False) - if rc == 0: - return True - else: - return False - - def _can_connect_to_dbus(self): - """ - Checks whether it is possible to connect to the system D-Bus bus. - - :returns: bool -- whether it is possible to connect to the system D-Bus bus. - """ - - try: - # Technically speaking, subscription-manager uses dbus-python - # as D-Bus library, so this ought to work; better be safe than - # sorry, I guess... - import dbus - except ImportError: - self.module.debug('dbus Python module not available, will use CLI') - return False - - try: - bus = dbus.SystemBus() - msg = dbus.lowlevel.SignalMessage('/', 'com.example', 'test') - bus.send_message(msg) - bus.flush() - - except dbus.exceptions.DBusException as e: - self.module.debug('Failed to connect to system D-Bus bus, will use CLI: %s' % e) - return False - - self.module.debug('Verified system D-Bus bus as usable') - return True - - def register(self, username, password, token, auto_attach, activationkey, org_id, - consumer_type, consumer_name, consumer_id, force_register, environment, - release): - ''' - Register the current system to the provided RHSM or Red Hat Satellite - or Katello server - - Raises: - * Exception - if any error occurs during the registration - ''' - # There is no support for token-based registration in the D-Bus API - # of rhsm, so always use the CLI in that case. - if not token and self._can_connect_to_dbus(): - self._register_using_dbus(username, password, auto_attach, - activationkey, org_id, consumer_type, - consumer_name, consumer_id, - force_register, environment, release) - return - self._register_using_cli(username, password, token, auto_attach, - activationkey, org_id, consumer_type, - consumer_name, consumer_id, - force_register, environment, release) - - def _register_using_cli(self, username, password, token, auto_attach, - activationkey, org_id, consumer_type, consumer_name, - consumer_id, force_register, environment, release): - ''' - Register using the 'subscription-manager' command - - Raises: - * Exception - if error occurs while running command - ''' - args = [SUBMAN_CMD, 'register'] - - # Generate command arguments - if force_register: - args.extend(['--force']) - - if org_id: - args.extend(['--org', org_id]) - - if auto_attach: - args.append('--auto-attach') - - if consumer_type: - args.extend(['--type', consumer_type]) - - if consumer_name: - args.extend(['--name', consumer_name]) - - if consumer_id: - args.extend(['--consumerid', consumer_id]) - - if environment: - args.extend(['--environment', environment]) - - if activationkey: - args.extend(['--activationkey', activationkey]) - elif token: - args.extend(['--token', token]) - else: - if username: - args.extend(['--username', username]) - if password: - args.extend(['--password', password]) - - if release: - args.extend(['--release', release]) - - rc, stderr, stdout = self.module.run_command(args, check_rc=True, expand_user_and_vars=False) - - def _register_using_dbus(self, username, password, auto_attach, - activationkey, org_id, consumer_type, consumer_name, - consumer_id, force_register, environment, release): - ''' - Register using D-Bus (connecting to the rhsm service) - - Raises: - * Exception - if error occurs during the D-Bus communication - ''' - import dbus - - SUBSCRIPTION_MANAGER_LOCALE = 'C' - # Seconds to wait for Registration to complete over DBus; - # 10 minutes should be a pretty generous timeout. - REGISTRATION_TIMEOUT = 600 - - def str2int(s, default=0): - try: - return int(s) - except ValueError: - return default - - distro_id = distro.id() - distro_version = tuple(str2int(p) for p in distro.version_parts()) - - # Stop the rhsm service when using systemd (which means Fedora or - # RHEL 7+): this is because the service may not use new configuration bits - # - with subscription-manager < 1.26.5-1 (in RHEL < 8.2); - # fixed later by https://github.com/candlepin/subscription-manager/pull/2175 - # - sporadically: https://bugzilla.redhat.com/show_bug.cgi?id=2049296 - if distro_id == 'fedora' or distro_version[0] >= 7: - cmd = ['systemctl', 'stop', 'rhsm'] - self.module.run_command(cmd, check_rc=True, expand_user_and_vars=False) - - # While there is a 'force' options for the registration, it is actually - # not implemented (and thus it does not work) - # - in RHEL 7 and earlier - # - in RHEL 8 before 8.8: https://bugzilla.redhat.com/show_bug.cgi?id=2118486 - # - in RHEL 9 before 9.2: https://bugzilla.redhat.com/show_bug.cgi?id=2121350 - # Hence, use it only when implemented, manually unregistering otherwise. - # Match it on RHEL, since we know about it; other distributions - # will need their own logic. - dbus_force_option_works = False - if (distro_id == 'rhel' and - ((distro_version[0] == 8 and distro_version[1] >= 8) or - (distro_version[0] == 9 and distro_version[1] >= 2) or - distro_version[0] > 9)): - dbus_force_option_works = True - - if force_register and not dbus_force_option_works: - self.unregister() - - register_opts = {} - if consumer_type: - register_opts['consumer_type'] = consumer_type - if consumer_name: - register_opts['name'] = consumer_name - if consumer_id: - register_opts['consumerid'] = consumer_id - if environment: - # The option for environments used to be 'environment' in versions - # of RHEL before 8.6, and then it changed to 'environments'; since - # the Register*() D-Bus functions reject unknown options, we have - # to pass the right option depending on the version -- funky. - environment_key = 'environment' - if distro_id == 'fedora' or \ - (distro_id == 'rhel' and - ((distro_version[0] == 8 and distro_version[1] >= 6) or - distro_version[0] >= 9)): - environment_key = 'environments' - register_opts[environment_key] = environment - if force_register and dbus_force_option_works: - register_opts['force'] = True - # Wrap it as proper D-Bus dict - register_opts = dbus.Dictionary(register_opts, signature='sv', variant_level=1) - - connection_opts = {} - # Wrap it as proper D-Bus dict - connection_opts = dbus.Dictionary(connection_opts, signature='sv', variant_level=1) - - bus = dbus.SystemBus() - register_server = bus.get_object('com.redhat.RHSM1', - '/com/redhat/RHSM1/RegisterServer') - address = register_server.Start( - SUBSCRIPTION_MANAGER_LOCALE, - dbus_interface='com.redhat.RHSM1.RegisterServer', - ) - - try: - # Use the private bus to register the system - self.module.debug('Connecting to the private DBus') - private_bus = dbus.connection.Connection(address) - - try: - if activationkey: - args = ( - org_id, - [activationkey], - register_opts, - connection_opts, - SUBSCRIPTION_MANAGER_LOCALE, - ) - private_bus.call_blocking( - 'com.redhat.RHSM1', - '/com/redhat/RHSM1/Register', - 'com.redhat.RHSM1.Register', - 'RegisterWithActivationKeys', - 'sasa{sv}a{sv}s', - args, - timeout=REGISTRATION_TIMEOUT, - ) - else: - args = ( - org_id or '', - username, - password, - register_opts, - connection_opts, - SUBSCRIPTION_MANAGER_LOCALE, - ) - private_bus.call_blocking( - 'com.redhat.RHSM1', - '/com/redhat/RHSM1/Register', - 'com.redhat.RHSM1.Register', - 'Register', - 'sssa{sv}a{sv}s', - args, - timeout=REGISTRATION_TIMEOUT, - ) - - except dbus.exceptions.DBusException as e: - # Sometimes we get NoReply but the registration has succeeded. - # Check the registration status before deciding if this is an error. - if e.get_dbus_name() == 'org.freedesktop.DBus.Error.NoReply': - if not self.is_registered(): - # Host is not registered so re-raise the error - raise - else: - raise - # Host was registered so continue - finally: - # Always shut down the private bus - self.module.debug('Shutting down private DBus instance') - register_server.Stop( - SUBSCRIPTION_MANAGER_LOCALE, - dbus_interface='com.redhat.RHSM1.RegisterServer', - ) - - # Make sure to refresh all the local data: this will fetch all the - # certificates, update redhat.repo, etc. - self.module.run_command([SUBMAN_CMD, 'refresh'], - check_rc=True, expand_user_and_vars=False) - - if auto_attach: - args = [SUBMAN_CMD, 'attach', '--auto'] - self.module.run_command(args, check_rc=True, expand_user_and_vars=False) - - # There is no support for setting the release via D-Bus, so invoke - # the CLI for this. - if release: - args = [SUBMAN_CMD, 'release', '--set', release] - self.module.run_command(args, check_rc=True, expand_user_and_vars=False) - - def unsubscribe(self, serials=None): - ''' - Unsubscribe a system from subscribed channels - Args: - serials(list or None): list of serials to unsubscribe. If - serials is none or an empty list, then - all subscribed channels will be removed. - Raises: - * Exception - if error occurs while running command - ''' - items = [] - if serials is not None and serials: - items = ["--serial=%s" % s for s in serials] - if serials is None: - items = ["--all"] - - if items: - args = [SUBMAN_CMD, 'remove'] + items - rc, stderr, stdout = self.module.run_command(args, check_rc=True) - return serials - - def unregister(self): - ''' - Unregister a currently registered system - Raises: - * Exception - if error occurs while running command - ''' - args = [SUBMAN_CMD, 'unregister'] - rc, stderr, stdout = self.module.run_command(args, check_rc=True) - self.update_plugin_conf('rhnplugin', False) - self.update_plugin_conf('subscription-manager', False) - - def subscribe(self, regexp): - ''' - Subscribe current system to available pools matching the specified - regular expression. It matches regexp against available pool ids first. - If any pool ids match, subscribe to those pools and return. - - If no pool ids match, then match regexp against available pool product - names. Note this can still easily match many many pools. Then subscribe - to those pools. - - Since a pool id is a more specific match, we only fallback to matching - against names if we didn't match pool ids. - - Raises: - * Exception - if error occurs while running command - ''' - # See https://github.com/ansible/ansible/issues/19466 - - # subscribe to pools whose pool id matches regexp (and only the pool id) - subscribed_pool_ids = self.subscribe_pool(regexp) - - # If we found any matches, we are done - # Don't attempt to match pools by product name - if subscribed_pool_ids: - return subscribed_pool_ids - - # We didn't match any pool ids. - # Now try subscribing to pools based on product name match - # Note: This can match lots of product names. - subscribed_by_product_pool_ids = self.subscribe_product(regexp) - if subscribed_by_product_pool_ids: - return subscribed_by_product_pool_ids - - # no matches - return [] - - def subscribe_by_pool_ids(self, pool_ids): - """ - Try to subscribe to the list of pool IDs - """ - available_pools = RhsmPools(self.module) - - available_pool_ids = [p.get_pool_id() for p in available_pools] - - for pool_id, quantity in sorted(pool_ids.items()): - if pool_id in available_pool_ids: - args = [SUBMAN_CMD, 'attach', '--pool', pool_id] - if quantity is not None: - args.extend(['--quantity', to_native(quantity)]) - rc, stderr, stdout = self.module.run_command(args, check_rc=True) - else: - self.module.fail_json(msg='Pool ID: %s not in list of available pools' % pool_id) - return pool_ids - - def subscribe_pool(self, regexp): - ''' - Subscribe current system to available pools matching the specified - regular expression - Raises: - * Exception - if error occurs while running command - ''' - - # Available pools ready for subscription - available_pools = RhsmPools(self.module) - - subscribed_pool_ids = [] - for pool in available_pools.filter_pools(regexp): - pool.subscribe() - subscribed_pool_ids.append(pool.get_pool_id()) - return subscribed_pool_ids - - def subscribe_product(self, regexp): - ''' - Subscribe current system to available pools matching the specified - regular expression - Raises: - * Exception - if error occurs while running command - ''' - - # Available pools ready for subscription - available_pools = RhsmPools(self.module) - - subscribed_pool_ids = [] - for pool in available_pools.filter_products(regexp): - pool.subscribe() - subscribed_pool_ids.append(pool.get_pool_id()) - return subscribed_pool_ids - - def update_subscriptions(self, regexp): - changed = False - consumed_pools = RhsmPools(self.module, consumed=True) - pool_ids_to_keep = [p.get_pool_id() for p in consumed_pools.filter_pools(regexp)] - pool_ids_to_keep.extend([p.get_pool_id() for p in consumed_pools.filter_products(regexp)]) - - serials_to_remove = [p.Serial for p in consumed_pools if p.get_pool_id() not in pool_ids_to_keep] - serials = self.unsubscribe(serials=serials_to_remove) - - subscribed_pool_ids = self.subscribe(regexp) - - if subscribed_pool_ids or serials: - changed = True - return {'changed': changed, 'subscribed_pool_ids': subscribed_pool_ids, - 'unsubscribed_serials': serials} - - def update_subscriptions_by_pool_ids(self, pool_ids): - changed = False - consumed_pools = RhsmPools(self.module, consumed=True) - - existing_pools = {} - serials_to_remove = [] - for p in consumed_pools: - pool_id = p.get_pool_id() - quantity_used = p.get_quantity_used() - existing_pools[pool_id] = quantity_used - - quantity = pool_ids.get(pool_id, 0) - if quantity is not None and quantity != quantity_used: - serials_to_remove.append(p.Serial) - - serials = self.unsubscribe(serials=serials_to_remove) - - missing_pools = {} - for pool_id, quantity in sorted(pool_ids.items()): - quantity_used = existing_pools.get(pool_id, 0) - if quantity is None and quantity_used == 0 or quantity not in (None, 0, quantity_used): - missing_pools[pool_id] = quantity - - self.subscribe_by_pool_ids(missing_pools) - - if missing_pools or serials: - changed = True - return {'changed': changed, 'subscribed_pool_ids': list(missing_pools.keys()), - 'unsubscribed_serials': serials} - - def sync_syspurpose(self): - """ - Try to synchronize syspurpose attributes with server - """ - args = [SUBMAN_CMD, 'status'] - rc, stdout, stderr = self.module.run_command(args, check_rc=False) - - -class RhsmPool(object): - ''' - Convenience class for housing subscription information - ''' - - def __init__(self, module, **kwargs): - self.module = module - for k, v in kwargs.items(): - setattr(self, k, v) - - def __str__(self): - return str(self.__getattribute__('_name')) - - def get_pool_id(self): - return getattr(self, 'PoolId', getattr(self, 'PoolID')) - - def get_quantity_used(self): - return int(getattr(self, 'QuantityUsed')) - - def subscribe(self): - args = "subscription-manager attach --pool %s" % self.get_pool_id() - rc, stdout, stderr = self.module.run_command(args, check_rc=True) - if rc == 0: - return True - else: - return False - - -class RhsmPools(object): - """ - This class is used for manipulating pools subscriptions with RHSM - """ - - def __init__(self, module, consumed=False): - self.module = module - self.products = self._load_product_list(consumed) - - def __iter__(self): - return self.products.__iter__() - - def _load_product_list(self, consumed=False): - """ - Loads list of all available or consumed pools for system in data structure - - Args: - consumed(bool): if True list consumed pools, else list available pools (default False) - """ - args = "subscription-manager list" - if consumed: - args += " --consumed" - else: - args += " --available" - lang_env = dict(LANG='C', LC_ALL='C', LC_MESSAGES='C') - rc, stdout, stderr = self.module.run_command(args, check_rc=True, environ_update=lang_env) - - products = [] - for line in stdout.split('\n'): - # Remove leading+trailing whitespace - line = line.strip() - # An empty line implies the end of a output group - if len(line) == 0: - continue - # If a colon ':' is found, parse - elif ':' in line: - (key, value) = line.split(':', 1) - key = key.strip().replace(" ", "") # To unify - value = value.strip() - if key in ['ProductName', 'SubscriptionName']: - # Remember the name for later processing - products.append(RhsmPool(self.module, _name=value, key=value)) - elif products: - # Associate value with most recently recorded product - products[-1].__setattr__(key, value) - # FIXME - log some warning? - # else: - # warnings.warn("Unhandled subscription key/value: %s/%s" % (key,value)) - return products - - def filter_pools(self, regexp='^$'): - ''' - Return a list of RhsmPools whose pool id matches the provided regular expression - ''' - r = re.compile(regexp) - for product in self.products: - if r.search(product.get_pool_id()): - yield product - - def filter_products(self, regexp='^$'): - ''' - Return a list of RhsmPools whose product name matches the provided regular expression - ''' - r = re.compile(regexp) - for product in self.products: - if r.search(product._name): - yield product - - -class SysPurpose(object): - """ - This class is used for reading and writing to syspurpose.json file - """ - - SYSPURPOSE_FILE_PATH = "/etc/rhsm/syspurpose/syspurpose.json" - - ALLOWED_ATTRIBUTES = ['role', 'usage', 'service_level_agreement', 'addons'] - - def __init__(self, path=None): - """ - Initialize class used for reading syspurpose json file - """ - self.path = path or self.SYSPURPOSE_FILE_PATH - - def update_syspurpose(self, new_syspurpose): - """ - Try to update current syspurpose with new attributes from new_syspurpose - """ - syspurpose = {} - syspurpose_changed = False - for key, value in new_syspurpose.items(): - if key in self.ALLOWED_ATTRIBUTES: - if value is not None: - syspurpose[key] = value - elif key == 'sync': - pass - else: - raise KeyError("Attribute: %s not in list of allowed attributes: %s" % - (key, self.ALLOWED_ATTRIBUTES)) - current_syspurpose = self._read_syspurpose() - if current_syspurpose != syspurpose: - syspurpose_changed = True - # Update current syspurpose with new values - current_syspurpose.update(syspurpose) - # When some key is not listed in new syspurpose, then delete it from current syspurpose - # and ignore custom attributes created by user (e.g. "foo": "bar") - for key in list(current_syspurpose): - if key in self.ALLOWED_ATTRIBUTES and key not in syspurpose: - del current_syspurpose[key] - self._write_syspurpose(current_syspurpose) - return syspurpose_changed - - def _write_syspurpose(self, new_syspurpose): - """ - This function tries to update current new_syspurpose attributes to - json file. - """ - with open(self.path, "w") as fp: - fp.write(json.dumps(new_syspurpose, indent=2, ensure_ascii=False, sort_keys=True)) - - def _read_syspurpose(self): - """ - Read current syspurpuse from json file. - """ - current_syspurpose = {} - try: - with open(self.path, "r") as fp: - content = fp.read() - except IOError: - pass - else: - current_syspurpose = json.loads(content) - return current_syspurpose - - -def main(): - - # Load RHSM configuration from file - rhsm = Rhsm(None) - - # Note: the default values for parameters are: - # 'type': 'str', 'default': None, 'required': False - # So there is no need to repeat these values for each parameter. - module = AnsibleModule( - argument_spec={ - 'state': {'default': 'present', 'choices': ['present', 'absent']}, - 'username': {}, - 'password': {'no_log': True}, - 'token': {'no_log': True}, - 'server_hostname': {}, - 'server_insecure': {}, - 'server_prefix': {}, - 'server_port': {}, - 'rhsm_baseurl': {}, - 'rhsm_repo_ca_cert': {}, - 'auto_attach': {'aliases': ['autosubscribe'], 'type': 'bool'}, - 'activationkey': {'no_log': True}, - 'org_id': {}, - 'environment': {}, - 'pool': {'default': '^$'}, - 'pool_ids': {'default': [], 'type': 'list', 'elements': 'raw'}, - 'consumer_type': {}, - 'consumer_name': {}, - 'consumer_id': {}, - 'force_register': {'default': False, 'type': 'bool'}, - 'server_proxy_hostname': {}, - 'server_proxy_scheme': {}, - 'server_proxy_port': {}, - 'server_proxy_user': {}, - 'server_proxy_password': {'no_log': True}, - 'release': {}, - 'syspurpose': { - 'type': 'dict', - 'options': { - 'role': {}, - 'usage': {}, - 'service_level_agreement': {}, - 'addons': {'type': 'list', 'elements': 'str'}, - 'sync': {'type': 'bool', 'default': False} - } - } - }, - required_together=[['username', 'password'], - ['server_proxy_hostname', 'server_proxy_port'], - ['server_proxy_user', 'server_proxy_password']], - mutually_exclusive=[['activationkey', 'username'], - ['activationkey', 'token'], - ['token', 'username'], - ['activationkey', 'consumer_id'], - ['activationkey', 'environment'], - ['activationkey', 'auto_attach'], - ['pool', 'pool_ids']], - required_if=[['state', 'present', ['username', 'activationkey', 'token'], True]], - ) - - rhsm.module = module - state = module.params['state'] - username = module.params['username'] - password = module.params['password'] - token = module.params['token'] - server_hostname = module.params['server_hostname'] - server_insecure = module.params['server_insecure'] - server_prefix = module.params['server_prefix'] - server_port = module.params['server_port'] - rhsm_baseurl = module.params['rhsm_baseurl'] - rhsm_repo_ca_cert = module.params['rhsm_repo_ca_cert'] - auto_attach = module.params['auto_attach'] - activationkey = module.params['activationkey'] - org_id = module.params['org_id'] - if activationkey and not org_id: - module.fail_json(msg='org_id is required when using activationkey') - environment = module.params['environment'] - pool = module.params['pool'] - pool_ids = {} - for value in module.params['pool_ids']: - if isinstance(value, dict): - if len(value) != 1: - module.fail_json(msg='Unable to parse pool_ids option.') - pool_id, quantity = list(value.items())[0] - else: - pool_id, quantity = value, None - pool_ids[pool_id] = quantity - consumer_type = module.params["consumer_type"] - consumer_name = module.params["consumer_name"] - consumer_id = module.params["consumer_id"] - force_register = module.params["force_register"] - server_proxy_hostname = module.params['server_proxy_hostname'] - server_proxy_port = module.params['server_proxy_port'] - server_proxy_user = module.params['server_proxy_user'] - server_proxy_password = module.params['server_proxy_password'] - release = module.params['release'] - syspurpose = module.params['syspurpose'] - - global SUBMAN_CMD - SUBMAN_CMD = module.get_bin_path('subscription-manager', True) - - syspurpose_changed = False - if syspurpose is not None: - try: - syspurpose_changed = SysPurpose().update_syspurpose(syspurpose) - except Exception as err: - module.fail_json(msg="Failed to update syspurpose attributes: %s" % to_native(err)) - - # Ensure system is registered - if state == 'present': - - # Register system - if rhsm.is_registered and not force_register: - if syspurpose and 'sync' in syspurpose and syspurpose['sync'] is True: - try: - rhsm.sync_syspurpose() - except Exception as e: - module.fail_json(msg="Failed to synchronize syspurpose attributes: %s" % to_native(e)) - if pool != '^$' or pool_ids: - try: - if pool_ids: - result = rhsm.update_subscriptions_by_pool_ids(pool_ids) - else: - result = rhsm.update_subscriptions(pool) - except Exception as e: - module.fail_json(msg="Failed to update subscriptions for '%s': %s" % (server_hostname, to_native(e))) - else: - module.exit_json(**result) - else: - if syspurpose_changed is True: - module.exit_json(changed=True, msg="Syspurpose attributes changed.") - else: - module.exit_json(changed=False, msg="System already registered.") - else: - try: - rhsm.enable() - rhsm.configure(**module.params) - rhsm.register(username, password, token, auto_attach, activationkey, org_id, - consumer_type, consumer_name, consumer_id, force_register, - environment, release) - if syspurpose and 'sync' in syspurpose and syspurpose['sync'] is True: - rhsm.sync_syspurpose() - if pool_ids: - subscribed_pool_ids = rhsm.subscribe_by_pool_ids(pool_ids) - elif pool != '^$': - subscribed_pool_ids = rhsm.subscribe(pool) - else: - subscribed_pool_ids = [] - except Exception as e: - module.fail_json(msg="Failed to register with '%s': %s" % (server_hostname, to_native(e))) - else: - module.exit_json(changed=True, - msg="System successfully registered to '%s'." % server_hostname, - subscribed_pool_ids=subscribed_pool_ids) - - # Ensure system is *not* registered - if state == 'absent': - if not rhsm.is_registered: - module.exit_json(changed=False, msg="System already unregistered.") - else: - try: - rhsm.unsubscribe() - rhsm.unregister() - except Exception as e: - module.fail_json(msg="Failed to unregister: %s" % to_native(e)) - else: - module.exit_json(changed=True, msg="System successfully unregistered from %s." % server_hostname) - - -if __name__ == '__main__': - main() diff --git a/SOURCES/vendoring-build.inc b/SOURCES/vendoring-build.inc new file mode 100644 index 0000000..090e67b --- /dev/null +++ b/SOURCES/vendoring-build.inc @@ -0,0 +1,104 @@ +# 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 +# - ha_cluster uses modprobe +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" + ["modprobe.py"]="ha_cluster" ) +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 + + # Remove doc_fragments + sed -i '/^extends_documentation_fragment:/,/^[^ -]/{/^extends/d;/^[ -]/d}' $role/library/$module +done + +# 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" + ["podman_secret.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 diff --git a/SOURCES/vendoring-prep.inc b/SOURCES/vendoring-prep.inc new file mode 100644 index 0000000..66ea974 --- /dev/null +++ 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 diff --git a/SPECS/linux-system-roles.spec b/SPECS/linux-system-roles.spec index b9cafe8..9270d93 100644 --- a/SPECS/linux-system-roles.spec +++ b/SPECS/linux-system-roles.spec @@ -1,15 +1,12 @@ -# 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 @@ -29,8 +26,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.22.0 +Release: 2%{?dist} License: GPLv3+ and MIT and BSD and Python %global _pkglicensedir %{_licensedir}/%{name} @@ -45,24 +42,6 @@ License: GPLv3+ and MIT and BSD and Python %global collection_version %{version} -# Helper macros originally from macros.ansible by Igor Raits -# 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 +86,92 @@ Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0) %%global rolestodir %%{?rolestodir} %%{roletodir%{1}} } -%global mainid d6a8e0167e9ed8d089093b7ead1e298241b534e1 +%global mainid e010c878833e363195dd707d1334ff48a254b092 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.3.8 %global rolename2 selinux -%deftag 2 1.5.6 +%deftag 2 1.6.1 %global rolename3 timesync -%deftag 3 1.7.2 +%deftag 3 1.7.6 %global rolename4 kdump -%deftag 4 1.2.6 +%deftag 4 1.3.6 %global rolename5 network -%deftag 5 1.11.2 +%deftag 5 1.13.1 %global rolename6 storage -%deftag 6 1.9.6 +%deftag 6 1.12.3 %global rolename7 metrics -%deftag 7 1.8.1 +%deftag 7 1.8.6 %global rolename8 tlog -%deftag 8 1.2.11 +%deftag 8 1.2.16 %global rolename9 kernel_settings -%deftag 9 1.1.11 +%deftag 9 1.1.17 %global rolename10 logging -%deftag 10 1.11.5 +%deftag 10 1.11.9 %global rolename11 nbde_server -%deftag 11 1.3.3 +%deftag 11 1.3.8 %global rolename12 nbde_client -%deftag 12 1.2.10 +%deftag 12 1.2.14 %global rolename13 certificate -%deftag 13 1.1.9 +%deftag 13 1.2.1 %global rolename14 crypto_policies -%deftag 14 1.2.7 +%deftag 14 1.2.11 %global forgeorg15 https://github.com/willshersystems %global repo15 ansible-sshd %global rolename15 sshd -%deftag 15 v0.18.1 +%deftag 15 v0.19.0 %global rolename16 ssh -%deftag 16 1.1.12 +%deftag 16 1.2.1 %global rolename17 ha_cluster -%deftag 17 1.8.7 +%deftag 17 1.10.0 %global rolename18 vpn -%deftag 18 1.5.3 +%deftag 18 1.5.8 %global rolename19 firewall -%deftag 19 1.4.2 +%deftag 19 1.6.3 %global rolename20 cockpit -%deftag 20 1.4.3 +%deftag 20 1.4.7 %global rolename21 podman -%deftag 21 1.1.2 +%deftag 21 1.3.2 %global rolename22 ad_integration -%deftag 22 1.0.2 +%deftag 22 1.1.3 %global rolename23 rhc -%deftag 23 1.1.3 +%deftag 23 1.2.4 %global rolename24 journald -%deftag 24 1.0.0 +%deftag 24 1.0.5 + +%global rolename25 postgresql +%deftag 25 1.1.0 + +%global rolename26 systemd +%deftag 26 1.0.1 + +%global rolename27 keylime_server +%deftag 27 1.0.0 Source1: %{archiveurl1} Source2: %{archiveurl2} @@ -209,16 +197,28 @@ Source21: %{archiveurl21} Source22: %{archiveurl22} Source23: %{archiveurl23} Source24: %{archiveurl24} +Source25: %{archiveurl25} +Source26: %{archiveurl26} +Source27: %{archiveurl27} # 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 +Patch2201: 0001-fix-use-command-stdin-for-password-and-do-not-log-pa.patch + BuildArch: noarch %if %{with html} @@ -235,6 +235,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} @@ -276,23 +278,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 -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 @@ -320,11 +310,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/min_ansible_version: 2.8/min_ansible_version: "2.9"/' meta/main.yml cd .. cd %{rolename7} @@ -340,110 +331,12 @@ 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 +cd %{rolename22} +%patch2201 -p1 +cd .. -# 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,14 +358,36 @@ 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 +# since the dependencies are already provided +sed -e '/^## Requirements/,/^#/s/^See below$/None/' \ + -e '/^### Collection requirements/,/^#/ {/^### Collection/d;/^#/!d}' \ + -i */README.md +# sshd README is not in the same format +sed -e '/^### Optional requirements/,/^Role variables/ {/^### Optional/d;/^Role variables/!d}' \ + -i sshd/README.md + + %if %{with html} +# HACK HACK HACK +# pandoc/asciidoc on rhel 8.9 does not like the journald README badge links +# remove all of the badge links from all README.md files +# in the first 14 lines of the file, remove any line that looks like a +# github action badge +# HACK HACK HACK readmes="" +matchstr="actions/workflows/" for role in %{rolenames}; do + sed -e "1,14 {\\,${matchstr},d; /\!\[/d}" -i $role/README.md readmes="${readmes} $role/README.md" done sh md2html.sh $readmes @@ -482,7 +397,7 @@ mkdir .collections %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" \ @@ -515,7 +430,7 @@ 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 \ +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 \ --src-owner %{name} --skip-git --skip-check --skip-changelog $extra_mapping --debug @@ -587,16 +502,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" - fi - if [[ "$newname" != *-playbook ]]; then - newname="${newname}-playbook" + 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 - cp "$file" "%{buildroot}%{_pkgdocdir}/$role/${newname}.yml" rm "$file" done if [ -f "%{buildroot}%{ansible_roles_dir}/%{roleinstprefix}$role/examples/inventory" ]; then @@ -610,7 +529,7 @@ 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]* @@ -753,9 +672,132 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \ %endif %changelog -* Mon Jun 12 2023 Rich Megginson - 1.21.2-1 -- Resolves:rhbz#2214282 : rhc - activation key registration fails if system is already registered -- Resolves:rhbz#2214284 : rhc - system role does not apply Insights tags +* Tue Aug 22 2023 Rich Megginson - 1.22.0-2 +- Resolves:rhbz#2232758 : ad_integration - leaks credentials when in check_mode + NOTE: changelog entry below has the wrong bz + +* Tue Aug 15 2023 Rich Megginson - 1.22.0-1 +- Resolves:rhbz#2223764 : ad_integration - leaks credentials when in check_mode +- Resolves:rhbz#2232241 : kdump - "Write new authorized_keys if needed" task idempotency issues +- Resolves:rhbz#2232231 : kdump - system role fails if kdump_ssh_user doesn't have a .ssh/authorized_keys file in home directory +- Resolves RHEL-1397 : kdump - fix: ensure .ssh directory exists for kdump_ssh_user on kdump_ssh_server +- Resolves RHEL-1499 : kdump - fix: Ensure authorized_keys management works with multiple hosts +- Resolves:rhbz#2223764 : firewall - fix: reload on resetting to defaults +- Resolves RHEL-1495 : firewall - fix: files: overwrite firewalld.conf on previous replaced +- Resolves RHEL-1497 : 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 - 1.22.0-0.21 +- Resolves:rhbz#2179455 : podman - support quadlet units + support for rootless quadlets, secrets + +* Wed Aug 09 2023 Rich Megginson - 1.22.0-0.20 +- Resolves:rhbz#2229802 : firewall - missing module in linux-system-roles.firewall to create an ipset + +* Tue Aug 01 2023 Rich Megginson - 1.22.0-0.19 +- Resolves:rhbz#2223764 : firewall - fix: reload on resetting to defaults +- Resolves:rhbz#2211984 : podman - Podman system role: Unable to use podman_registries_conf to set unqualified-search-registries +- Resolves:rhbz#2227821 : rhc - baseurl in rhsm.conf is empty when rhc_baseurl is not specified +- Resolves RHEL-906 : kdump - use failure_action instead of default on EL9 and later +- Resolves RHEL-898 : firewall - Check mode fails with replacing previous rules +- Resolves RHEL-885 : firewall - Ansible RHEL firewall system role not idempotent when configuring the interface using the role in rhel9 +- Resolves RHEL-865 : podman - use getsubids to look for subuid, subgid for IdM support +- Resolves RHEL-857 : podman - allow to not pull images, continue if image pull fails + +* Wed Jul 26 2023 Rich Megginson - 1.22.0-0.18 +- Resolves:rhbz#2224384 : systemd - system role for managing systemd units + +* Tue Jul 25 2023 Rich Megginson - 1.22.0-0.17 +- Resolves:rhbz#2224385 : keylime_server - system role for managing keylime servers + +* Fri Jul 21 2023 Rich Megginson - 1.22.0-0.16 +- Resolves:rhbz#2222761 : firewall - should have option to disable conflicting services +- Resolves:rhbz#2161712 : podman - allow container networking configuration +- Resolves:rhbz#2179457 : podman - support for healthchecks and healthcheck actions +- Resolves:rhbz#2179455 : podman - support quadlet units +- Resolves:rhbz#2224384 : systemd - system role for managing systemd units +- Resolves:rhbz#2223032 : ALL - facts being gathered unnecessarily +- Resolves:rhbz#2224138 : certificate - rhel-system-roles.certificate does not re-issue after updating key_size +- Resolves:rhbz#2222428 : firewall - Check mode fails when creating new firewall service +- Resolves:rhbz#2224090 : storage - RAID volume pre cleanup - remove existing data from member disks as needed before creation +- Resolves:rhbz#2123859 : firewall - when firewalld.service is masked, firewall role fails + +* Mon Jul 10 2023 Rich Megginson - 1.22.0-0.15 +- Resolves:rhbz#2180902 : certificate - add mode parameter to change permissions for cert files +- Resolves:rhbz#2218592 : network - Support no-aaaa DNS option + +* Sun Jul 09 2023 Rich Megginson - 1.22.0-0.14 +- Resolves:rhbz#2213691 : storage - [RHEL8] Unexpected behavior when creating ext4 filesystem with invalid parameter + +* Fri Jun 23 2023 Rich Megginson - 1.22.0-0.13 +- Resolves:rhbz#2216753 : ssh - add ssh_backup option with default true +- Resolves:rhbz#2216520 : firewall - Don't install python(3)-firewall it's a dependency of firewalld + +* Thu Jun 22 2023 Rich Megginson - 1.22.0-0.12 +- Resolves:rhbz#2168692 : storage - Storage: mounted devices that are in use cannot be resized + +* Tue Jun 20 2023 Rich Megginson - 1.22.0-0.11 +- Resolves:rhbz#2211187 : kdump - support auto_reset_crashkernel, dracut_args, deprecate /etc/sysconfig/kdump + +* Wed Jun 07 2023 Rich Megginson - 1.22.0-0.10 +- Resolves:rhbz#2186253 : ad_integration - add ad_integration_force_rejoin + +* Tue Jun 06 2023 Rich Megginson - 1.22.0-0.9 +- Resolves:rhbz#2211194 : network - Support configuring auto-dns setting +- Resolves:rhbz#2211748 : rhc - implement rhc_proxy.scheme +- Resolves:rhbz#2179460 : selinux - use restorecon -T 0 on supported platforms +- Resolves:rhbz#2181656 : storage - RFE for the storage system role to support configuring the stripe size for RAID LVM volumes +- Resolves:rhbz#2210916 : storage - [RHEL9] Failed to commit changes to disk: Failed to format device: Input/output error + +* Tue May 30 2023 Rich Megginson - 1.22.0-0.8 +- Resolves:rhbz#2181657 : storage - [RFE] user-specified mount point owner and permissions +- Resolves:rhbz#2193058 : storage - Cannot set chunk size for RAID: Unsupported parameters for (blivet) module: pools.raid_chunk_size +- Resolves:rhbz#2210916 : storage - [RHEL9] Failed to commit changes to disk: Failed to format device: Input/output error + +* 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 +- Resolves:rhbz#2185065 : ha_cluster - support for resource and operation defaults +- Resolves:rhbz#2151373 : postgresql - [RFE] system role for PostgreSQL management +- Resolves:rhbz#2179026 : rhc - [RFE] New role for Red Hat subscription management, insights management [rhel-9.3.0] +- Resolves:rhbz#2185066 : ha_cluster - use pcs to setup qdevice certificates if available +- Resolves:rhbz#2185002 : spec: Remove doc fragments from vendored modules +- Resolves:rhbz#2175324 : use ansible-galaxy collection build/install instead of tar +- Resolves:rhbz#2186218 : rhc - RHC system role: activation key registration fails if system is already registered +- Resolves:rhbz#2190501 : selinux - failing test - sshd/tests_firewall_selinux.yml - No package matching 'firewalld' found available, installed or updated + +* Wed May 3 2023 Rich Megginson - 1.22.0-0.5 +- fix issue with postgresql tests + +* Tue May 2 2023 Rich Megginson - 1.22.0-0.4 +- fix issue with ha_cluster vendoring modprobe +- move vendoring into included files + +* Thu Apr 27 2023 Rich Megginson - 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 - 1.22.0-0.2 +- initial 8.9/9.3 + +* Thu Apr 6 2023 Sergei Petrosian - 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 - 1.21.1-1 - Resolves:rhbz#2141330 : rhc - new role for subscription management/registration/insights