logging_purge_conf fix; kernel_settings ansible_managed fix; vpn_ipaddr fix
vpn - use custom vpn_ipaddr filter to make role work on RHEL 8.6 with ansible-core this is covered by "make roles work with ansible-core on all platforms" BZ logging - Logging role "logging_purge_confs" option not properly working Resolves: rhbz#2039106 kernel_settings role should use ansible_managed in its configuration file Resolves: rhbz#2047506 (cherry picked from commit 136a75679287eb30dc043cee5a59190b10c1e478)
This commit is contained in:
Rich Megginson
parent
29d1488c2c
commit
38a41c08a0
@ -1,4 +1,6 @@
|
||||
# NOTE - may revisit this once ansible-core is in 8.6
|
||||
# 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
|
||||
%global ansible_build_dep ansible-core >= 2.11.0
|
||||
@ -28,8 +30,8 @@ Name: linux-system-roles
|
||||
%endif
|
||||
Url: https://github.com/linux-system-roles
|
||||
Summary: Set of interfaces for unified system management
|
||||
Version: 1.11.0
|
||||
Release: 3%{?dist}
|
||||
Version: 1.12.0
|
||||
Release: 1%{?dist}
|
||||
|
||||
#Group: Development/Libraries
|
||||
License: GPLv3+ and MIT and BSD and Python
|
||||
@ -147,11 +149,11 @@ BuildRequires: %{ansible_build_dep}
|
||||
|
||||
#%%defcommit 9 9373303b98e09ef38df7afc8d06e5e55812096c7
|
||||
%global rolename9 kernel_settings
|
||||
%deftag 9 1.1.2
|
||||
%deftag 9 1.1.4
|
||||
|
||||
#%%defcommit 10 20dd3e5520ca06dcccaa9b3f1fb428d055e0c23f
|
||||
%global rolename10 logging
|
||||
%deftag 10 1.6.1
|
||||
%deftag 10 1.8.1
|
||||
|
||||
#%%defcommit 11 c57d0b1f3384c525738fa26ba4bdca485e162567
|
||||
%global rolename11 nbde_server
|
||||
@ -185,7 +187,7 @@ BuildRequires: %{ansible_build_dep}
|
||||
|
||||
#%%defcommit 18 5f6cb73e6753fbdbb219b7d3079f0378b2d3bdb3
|
||||
%global rolename18 vpn
|
||||
%deftag 18 1.2.2
|
||||
%deftag 18 1.3.0
|
||||
|
||||
%global rolename19 firewall
|
||||
%deftag 19 1.0.1
|
||||
@ -193,7 +195,7 @@ BuildRequires: %{ansible_build_dep}
|
||||
%global rolename20 cockpit
|
||||
%deftag 20 1.1.2
|
||||
|
||||
%global mainid ae7a7b58983c6e1c9fb5eb930777de0d423dffeb
|
||||
%global mainid 792c7c0a5633b0a41edf7b1cb4d97963a585e508
|
||||
Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz
|
||||
Source1: %{archiveurl1}
|
||||
Source2: %{archiveurl2}
|
||||
@ -219,11 +221,10 @@ Source20: %{archiveurl20}
|
||||
# Collection tarballs from Automation Hub
|
||||
# Not used on Fedora.
|
||||
Source801: ansible-posix-1.3.0.tar.gz
|
||||
Source802: ansible-netcommon-2.4.0.tar.gz
|
||||
|
||||
# Collection tarballs from Galaxy
|
||||
# Not used on Fedora.
|
||||
Source901: community-general-4.1.0.tar.gz
|
||||
Source901: community-general-4.3.0.tar.gz
|
||||
|
||||
# Script to convert the collection README to Automation Hub.
|
||||
# Not used on Fedora.
|
||||
@ -249,13 +250,8 @@ BuildRequires: highlight
|
||||
BuildRequires: python3
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
BuildRequires: %{py3_dist ruamel.yaml}
|
||||
Requires: python3-jmespath
|
||||
Requires: python3-netaddr
|
||||
%else
|
||||
BuildRequires: python3-ruamel-yaml
|
||||
|
||||
Requires: python-jmespath
|
||||
Requires: python-netaddr
|
||||
%endif
|
||||
|
||||
Obsoletes: rhel-system-roles-techpreview < 1.0-3
|
||||
@ -377,19 +373,6 @@ for module in "${!module_map[@]}"; do
|
||||
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
|
||||
|
||||
# ansible.netcommon:
|
||||
# - filter_plugins:
|
||||
# - Filter ipaddr for the vpn role
|
||||
declare -A module_map=( ["ipaddr.py"]="vpn" )
|
||||
for module in "${!module_map[@]}"; do
|
||||
role="${module_map[${module}]}"
|
||||
if [ ! -d $role/filter_plugins ]; then
|
||||
mkdir $role/filter_plugins
|
||||
fi
|
||||
cp -pL .external/ansible/netcommon/plugins/filter/$module $role/filter_plugins/$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/filter_plugins/$module
|
||||
done
|
||||
|
||||
# community.general:
|
||||
# - library:
|
||||
# - Module seport, sefcontext and selogin for the selinux role rolename2
|
||||
@ -473,18 +456,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
|
||||
|
||||
%if 0%{?rhel}
|
||||
# Convert vendored plugins to FQCN for collection
|
||||
# ansible.netcommon:
|
||||
# - filter_plugins:
|
||||
# - Filter ipaddr for the vpn role
|
||||
declare -A module_map=( ["ipaddr"]="vpn" )
|
||||
for module in "${!module_map[@]}"; do
|
||||
role="${module_map[${module}]}"
|
||||
find .collections/ansible_collections/%{collection_namespace}/%{collection_name}/*/vpn \( -iname "*.yml" -o -iname "*.j2" \) -exec sed -i -e "s/\<$module\>/%{collection_namespace}.%{collection_name}.&/g" {} \;
|
||||
done
|
||||
%endif
|
||||
|
||||
# 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 \
|
||||
@ -733,6 +704,16 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Jan 27 2022 Rich Megginson <rmeggins@redhat.com> - 1.12.0-1
|
||||
- vpn - use custom vpn_ipaddr filter to make role work on RHEL 8.6 with ansible-core
|
||||
this is covered by "make roles work with ansible-core on all platforms" BZ
|
||||
- logging - Logging role "logging_purge_confs" option not properly working
|
||||
Resolves rhbz#2040812 (EL8)
|
||||
Resolves rhbz#2039106 (EL9)
|
||||
- kernel_settings role should use ansible_managed in its configuration file
|
||||
Resolves rhbz#2047504 (EL8)
|
||||
Resolves rhbz#2047506 (EL9)
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user