ha_cluster permissions; network bonding; some more ansible_managed

ha_cluster - set permissions for haclient group
Resolves: rhbz#2049754 (EL9)

network - Add more bonding options to rhel-system-roles.network
Resolves: rhbz#2054435 (EL9)

network - Fix or remove failing test tests_switch_provider_RHEL9. No package network-scripts available.
Resolves: rhbz#2050362 (EL9)

certificate - should consistently use ansible_managed in hook scripts
Resolves: rhbz#2054368 (EL9)

tlog - consistently use ansible_managed in configuration files managed by role
Resolves: rhbz#2054367 (EL9)

vpn - consistently use ansible_managed in configuration files managed by role
Resolves: rhbz#2054369 (EL9)

(cherry picked from commit 5bc1032e7397cbdf1654c987d0bdfe1fb8ae247c)
This commit is contained in:
Rich Megginson 2022-01-17 16:43:55 -07:00
parent 4c27e01955
commit ea9739eb49

View File

@ -30,7 +30,7 @@ Name: linux-system-roles
%endif %endif
Url: https://github.com/linux-system-roles Url: https://github.com/linux-system-roles
Summary: Set of interfaces for unified system management Summary: Set of interfaces for unified system management
Version: 1.13.0 Version: 1.14.0
Release: 1%{?dist} Release: 1%{?dist}
#Group: Development/Libraries #Group: Development/Libraries
@ -141,9 +141,9 @@ BuildRequires: %{ansible_build_dep}
%global rolename4 kdump %global rolename4 kdump
%deftag 4 1.2.2 %deftag 4 1.2.2
%defcommit 5 2b881a6c3fac68457711be598523f625ded16565 #%%defcommit 5 59be6188579cc61a30230f978f38f67878251abc
%global rolename5 network %global rolename5 network
#%%deftag 5 1.5.0 %deftag 5 1.7.0
#%%defcommit 6 50d2b8ccc98a8f4cb9d1d550d21adc227181e9fa #%%defcommit 6 50d2b8ccc98a8f4cb9d1d550d21adc227181e9fa
%global rolename6 storage %global rolename6 storage
@ -155,7 +155,7 @@ BuildRequires: %{ansible_build_dep}
#%%defcommit 8 2b9e53233ee3a68bdb532e62f289733e436a6106 #%%defcommit 8 2b9e53233ee3a68bdb532e62f289733e436a6106
%global rolename8 tlog %global rolename8 tlog
%deftag 8 1.2.3 %deftag 8 1.2.5
#%%defcommit 9 9373303b98e09ef38df7afc8d06e5e55812096c7 #%%defcommit 9 9373303b98e09ef38df7afc8d06e5e55812096c7
%global rolename9 kernel_settings %global rolename9 kernel_settings
@ -175,7 +175,7 @@ BuildRequires: %{ansible_build_dep}
#%%defcommit 13 310fc53db04e8d3134524afb7a89b0477a2ffb83 #%%defcommit 13 310fc53db04e8d3134524afb7a89b0477a2ffb83
%global rolename13 certificate %global rolename13 certificate
%deftag 13 1.1.2 %deftag 13 1.1.3
#%%defcommit 14 b2a9857ac661fa32e66666e444b73bfdb34cdf95 #%%defcommit 14 b2a9857ac661fa32e66666e444b73bfdb34cdf95
%global rolename14 crypto_policies %global rolename14 crypto_policies
@ -193,11 +193,11 @@ BuildRequires: %{ansible_build_dep}
#%%defcommit 17 f901239cb91878719c9e7461760ef8d4789d626d #%%defcommit 17 f901239cb91878719c9e7461760ef8d4789d626d
%global rolename17 ha_cluster %global rolename17 ha_cluster
%deftag 17 1.4.0 %deftag 17 1.4.1
#%%defcommit 18 5f6cb73e6753fbdbb219b7d3079f0378b2d3bdb3 #%%defcommit 18 5f6cb73e6753fbdbb219b7d3079f0378b2d3bdb3
%global rolename18 vpn %global rolename18 vpn
%deftag 18 1.3.1 %deftag 18 1.3.2
%global rolename19 firewall %global rolename19 firewall
%deftag 19 1.0.3 %deftag 19 1.0.3
@ -205,7 +205,7 @@ BuildRequires: %{ansible_build_dep}
%global rolename20 cockpit %global rolename20 cockpit
%deftag 20 1.2.1 %deftag 20 1.2.1
%global mainid 32ab2252be64d5e71454b83dc2c701d22168bef4 %global mainid 07860ebb58a41f294b5ff41b1b5ab8f358cd9513
Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz
Source1: %{archiveurl1} Source1: %{archiveurl1}
Source2: %{archiveurl2} Source2: %{archiveurl2}
@ -234,7 +234,7 @@ Source801: ansible-posix-1.3.0.tar.gz
# Collection tarballs from Galaxy # Collection tarballs from Galaxy
# Not used on Fedora. # 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. # Script to convert the collection README to Automation Hub.
# Not used on Fedora. # Not used on Fedora.
@ -384,7 +384,8 @@ done
# community.general: # community.general:
# - library: # - library:
# - Module seport, sefcontext and selogin for the selinux role rolename2 # - 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 for module in "${!module_map[@]}"; do
role="${module_map[${module}]}" role="${module_map[${module}]}"
if [ ! -d $role/library ]; then 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" \ "https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%208&component=rhel-system-roles" \
> galaxy.yml.tmp > galaxy.yml.tmp
# we vendor-in all of the dependencies on rhel, so remove them # we vendor-in all of the dependencies on rhel, so remove them
rm lsr_role2collection/collection_requirements.txt rm -f lsr_role2collection/collection_requirements.txt
# but leave bindep.txt for now # but leave bindep.txt
%else %else
./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" \ ./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" \
"Linux System Roles Ansible Collection" \ "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-path $(pwd) --dest-path $(pwd)/.collections $includes --force --no-update \
--src-owner %{name} --skip-git --skip-check --debug --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 # Remove table of contents from logging README.md
# It is not needed for html and AH/Galaxy # It is not needed for html and AH/Galaxy
sed -i -e 's/^\(## Table of Contents\)/## Background\n\1/' \ sed -i -e 's/^\(## Table of Contents\)/## Background\n\1/' \
@ -719,6 +710,23 @@ fi
%endif %endif
%changelog %changelog
* Mon Feb 21 2022 Rich Megginson <rmeggins@redhat.com> - 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)
* Mon Feb 14 2022 Rich Megginson <rmeggins@redhat.com> - 1.13.0-1 * Mon Feb 14 2022 Rich Megginson <rmeggins@redhat.com> - 1.13.0-1
- storage - RFE: Add support for RAID volumes (lvm-only) - storage - RFE: Add support for RAID volumes (lvm-only)
Resolves rhbz#2016514 (EL8) Resolves rhbz#2016514 (EL8)