From f61556eb54dc4b7e7c302c55d4cd97784e19ecec Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Feb 21 2022 02:21:47 +0000 Subject: import rhel-system-roles-1.14.0-1.el8 --- diff --git a/.gitignore b/.gitignore index cbfbd0d..60e4b54 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,23 @@ SOURCES/ansible-posix-1.3.0.tar.gz SOURCES/ansible-sshd-214df35c0bee77b5d69f49c2da269251d451b28f.tar.gz -SOURCES/auto-maintenance-32ab2252be64d5e71454b83dc2c701d22168bef4.tar.gz -SOURCES/certificate-1.1.2.tar.gz +SOURCES/auto-maintenance-07860ebb58a41f294b5ff41b1b5ab8f358cd9513.tar.gz +SOURCES/certificate-1.1.3.tar.gz SOURCES/cockpit-1.2.1.tar.gz -SOURCES/community-general-4.3.0.tar.gz +SOURCES/community-general-4.4.0.tar.gz SOURCES/crypto_policies-1.2.3.tar.gz SOURCES/firewall-1.0.3.tar.gz -SOURCES/ha_cluster-1.4.0.tar.gz +SOURCES/ha_cluster-1.4.1.tar.gz SOURCES/kdump-1.2.2.tar.gz SOURCES/kernel_settings-1.1.4.tar.gz SOURCES/logging-1.8.1.tar.gz SOURCES/metrics-1.4.1.tar.gz SOURCES/nbde_client-1.2.0.tar.gz SOURCES/nbde_server-1.1.2.tar.gz -SOURCES/network-2b881a6c3fac68457711be598523f625ded16565.tar.gz +SOURCES/network-1.7.0.tar.gz SOURCES/postfix-1.1.3.tar.gz SOURCES/selinux-1.3.4.tar.gz SOURCES/ssh-1.1.4.tar.gz SOURCES/storage-1.7.0.tar.gz SOURCES/timesync-1.6.5.tar.gz -SOURCES/tlog-1.2.3.tar.gz -SOURCES/vpn-1.3.1.tar.gz +SOURCES/tlog-1.2.5.tar.gz +SOURCES/vpn-1.3.2.tar.gz diff --git a/.rhel-system-roles.metadata b/.rhel-system-roles.metadata index 4ebeabe..e7f2354 100644 --- a/.rhel-system-roles.metadata +++ b/.rhel-system-roles.metadata @@ -1,23 +1,23 @@ d2d2382c38eaf34d2295aba2aa4652d75ebbaeef SOURCES/ansible-posix-1.3.0.tar.gz a4d4556cf6628e87fa62dec6c46099338b499930 SOURCES/ansible-sshd-214df35c0bee77b5d69f49c2da269251d451b28f.tar.gz -749f960ce46712b9571339ecbc43b532c5eb662f SOURCES/auto-maintenance-32ab2252be64d5e71454b83dc2c701d22168bef4.tar.gz -b9cb802ff62e34fe6297ecee79485f7ff1466a69 SOURCES/certificate-1.1.2.tar.gz +b64ad3ed71082042aa9cbaf3b4cf4f98240429a6 SOURCES/auto-maintenance-07860ebb58a41f294b5ff41b1b5ab8f358cd9513.tar.gz +cee41b5fd6359e9ddeb83c5af7b8057fef6b2334 SOURCES/certificate-1.1.3.tar.gz 004064268df0e7dd154331b7799272d3277388d4 SOURCES/cockpit-1.2.1.tar.gz -52f68703d358cb96e112786c65fc8d48edd84624 SOURCES/community-general-4.3.0.tar.gz +a7a5fb799f9446f27f1d19c6b1610bbe13c6ae04 SOURCES/community-general-4.4.0.tar.gz 0684c1335923ba8ebbb05afbd507e5ff31f874d6 SOURCES/crypto_policies-1.2.3.tar.gz 07ec8941f8ee167256276e3a02cb1834449bb0e1 SOURCES/firewall-1.0.3.tar.gz -5b3a6aa19d02fdee694f6410f62beb769f2006b5 SOURCES/ha_cluster-1.4.0.tar.gz +9a990a4908bdf3269bce4f214907623780a5e221 SOURCES/ha_cluster-1.4.1.tar.gz a1c9c89dea1dbe2410465c29ad0e1d3637ac5f52 SOURCES/kdump-1.2.2.tar.gz 72bd06d25e4c841e53be7fa1330c859ac8f76a6d SOURCES/kernel_settings-1.1.4.tar.gz e530528ba5f9478cc8604aa6612388ea8e5078af SOURCES/logging-1.8.1.tar.gz c0dbbea68bba05ee98c3e1a686c328e741abe763 SOURCES/metrics-1.4.1.tar.gz 641ab2f8cd9916a43c8b580907203a3304110d1e SOURCES/nbde_client-1.2.0.tar.gz 33f0a3ea008021e69b2bbd7b25f6536f91e7613d SOURCES/nbde_server-1.1.2.tar.gz -b1a1fef24ee346e71a69606bee8cbc213b26f9a5 SOURCES/network-2b881a6c3fac68457711be598523f625ded16565.tar.gz +d870a7ea07435b5a65f181139817f1c6c410fb16 SOURCES/network-1.7.0.tar.gz 19b7356c0857acd54956a08132d8dd67a4c071d4 SOURCES/postfix-1.1.3.tar.gz 4e5c5216814577ee55304721e5c811ed8857efbc SOURCES/selinux-1.3.4.tar.gz f38972c4b22a9f226b58725c7e9ba8fac692bba2 SOURCES/ssh-1.1.4.tar.gz 0728b4e01261f84ce470431a4ea21907db75f26a SOURCES/storage-1.7.0.tar.gz b9f1b88b8eda052161bc86473b383ad88692249c SOURCES/timesync-1.6.5.tar.gz -48a233ef19b6014f36c9a20eb1017817c4281bcd SOURCES/tlog-1.2.3.tar.gz -1b45d6e47bb4aa9e7840c416cb142981666c29a7 SOURCES/vpn-1.3.1.tar.gz +17e6f3d437d161143c87b6709a42a3eff6ef7df0 SOURCES/tlog-1.2.5.tar.gz +d1bb00636c04bc1b2d94ce0e491afe9ef921cd56 SOURCES/vpn-1.3.2.tar.gz diff --git a/SPECS/rhel-system-roles.spec b/SPECS/rhel-system-roles.spec index 5a4c52c..138ddd5 100644 --- a/SPECS/rhel-system-roles.spec +++ b/SPECS/rhel-system-roles.spec @@ -30,7 +30,7 @@ Name: linux-system-roles %endif Url: https://github.com/linux-system-roles Summary: Set of interfaces for unified system management -Version: 1.13.1 +Version: 1.14.0 Release: 1%{?dist} #Group: Development/Libraries @@ -141,9 +141,9 @@ BuildRequires: %{ansible_build_dep} %global rolename4 kdump %deftag 4 1.2.2 -%defcommit 5 2b881a6c3fac68457711be598523f625ded16565 +#%%defcommit 5 59be6188579cc61a30230f978f38f67878251abc %global rolename5 network -#%%deftag 5 1.5.0 +%deftag 5 1.7.0 #%%defcommit 6 50d2b8ccc98a8f4cb9d1d550d21adc227181e9fa %global rolename6 storage @@ -155,7 +155,7 @@ BuildRequires: %{ansible_build_dep} #%%defcommit 8 2b9e53233ee3a68bdb532e62f289733e436a6106 %global rolename8 tlog -%deftag 8 1.2.3 +%deftag 8 1.2.5 #%%defcommit 9 9373303b98e09ef38df7afc8d06e5e55812096c7 %global rolename9 kernel_settings @@ -175,7 +175,7 @@ BuildRequires: %{ansible_build_dep} #%%defcommit 13 310fc53db04e8d3134524afb7a89b0477a2ffb83 %global rolename13 certificate -%deftag 13 1.1.2 +%deftag 13 1.1.3 #%%defcommit 14 b2a9857ac661fa32e66666e444b73bfdb34cdf95 %global rolename14 crypto_policies @@ -193,11 +193,11 @@ BuildRequires: %{ansible_build_dep} #%%defcommit 17 f901239cb91878719c9e7461760ef8d4789d626d %global rolename17 ha_cluster -%deftag 17 1.4.0 +%deftag 17 1.4.1 #%%defcommit 18 5f6cb73e6753fbdbb219b7d3079f0378b2d3bdb3 %global rolename18 vpn -%deftag 18 1.3.1 +%deftag 18 1.3.2 %global rolename19 firewall %deftag 19 1.0.3 @@ -205,7 +205,7 @@ BuildRequires: %{ansible_build_dep} %global rolename20 cockpit %deftag 20 1.2.1 -%global mainid 32ab2252be64d5e71454b83dc2c701d22168bef4 +%global mainid 07860ebb58a41f294b5ff41b1b5ab8f358cd9513 Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz Source1: %{archiveurl1} Source2: %{archiveurl2} @@ -234,7 +234,7 @@ Source801: ansible-posix-1.3.0.tar.gz # Collection tarballs from Galaxy # Not used on Fedora. -Source901: community-general-4.3.0.tar.gz +Source901: community-general-4.4.0.tar.gz # Script to convert the collection README to Automation Hub. # Not used on Fedora. @@ -384,7 +384,8 @@ done # community.general: # - library: # - Module seport, sefcontext and selogin for the selinux role rolename2 -module_map=( ["seport.py"]="selinux" ["sefcontext.py"]="selinux" ["selogin.py"]="selinux" ) +# - Module ini_file for role tlog +module_map=( ["seport.py"]="selinux" ["sefcontext.py"]="selinux" ["selogin.py"]="selinux" ["ini_file.py"]="tlog" ) for module in "${!module_map[@]}"; do role="${module_map[${module}]}" if [ ! -d $role/library ]; then @@ -449,8 +450,8 @@ mkdir .collections "https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%208&component=rhel-system-roles" \ > galaxy.yml.tmp # we vendor-in all of the dependencies on rhel, so remove them -rm lsr_role2collection/collection_requirements.txt -# but leave bindep.txt for now +rm -f lsr_role2collection/collection_requirements.txt +# but leave bindep.txt %else ./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" \ "Linux System Roles Ansible Collection" \ @@ -471,16 +472,6 @@ LANG=en_US.utf-8 LC_ALL=en_US.utf-8 python3 release_collection.py --galaxy-yml g --src-path $(pwd) --dest-path $(pwd)/.collections $includes --force --no-update \ --src-owner %{name} --skip-git --skip-check --debug -# copy requirements.txt and bindep.txt from auto-maintenance/lsr_role2collection -if [ -f lsr_role2collection/collection_requirements.txt ]; then - cp lsr_role2collection/collection_requirements.txt \ - .collections/ansible_collections/%{collection_namespace}/%{collection_name}/requirements.txt -fi -if [ -f lsr_role2collection/collection_bindep.txt ]; then - cp lsr_role2collection/collection_bindep.txt \ - .collections/ansible_collections/%{collection_namespace}/%{collection_name}/bindep.txt -fi - # Remove table of contents from logging README.md # It is not needed for html and AH/Galaxy sed -i -e 's/^\(## Table of Contents\)/## Background\n\1/' \ @@ -719,6 +710,23 @@ fi %endif %changelog +* Mon Feb 14 2022 Rich Megginson - 1.14.0-1 +- ha_cluster - set permissions for haclient group + Resolves rhbz#2049747 (EL8) + Resolves rhbz#2049754 (EL9) +- network - Add more bonding options to rhel-system-roles.network + Resolves rhbz#2008931 (EL8) + Resolves rhbz#2054435 (EL9) +- certificate - should consistently use ansible_managed in hook scripts + Resolves rhbz#2054364 (EL8) + Resolves rhbz#2054368 (EL9) +- tlog - consistently use ansible_managed in configuration files managed by role + Resolves rhbz#2054363 (EL8) + Resolves rhbz#2054367 (EL9) +- vpn - consistently use ansible_managed in configuration files managed by role + Resolves rhbz#2054365 (EL8) + Resolves rhbz#2054369 (EL9) + * Tue Feb 8 2022 Rich Megginson - 1.13.1-1 - vpn - template error while templating string: no filter named 'vpn_ipaddr' Resolves rhbz#2052103 (EL8)