rpms/rhel-system-roles
7
0
Fork 0
Code Issues Pull Requests Releases Activity

vpn - no filter named vpn_ipaddr; kdump - kdump.service fails; remove collection dependencies

Browse Source 
vpn - template error while templating string: no filter named 'vpn_ipaddr'
Resolves: rhbz#2050341 (EL9)

kdump - Unable to start service kdump: Job for kdump.service failed because the control process exited with error code.
Resolves: rhbz#2050419 (EL9)

remove collection dependencies on rhel because we vendor them in

(cherry picked from commit 62325241126fc196a0de1b2ea9fbed8861497f3d)
This commit is contained in:
Rich Megginson 2022-02-08 11:06:18 -07:00
parent 6a51ef1ecc
commit 8a208687ce
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
linux-system-roles.spec
View File

@ -30,8 +30,8 @@ 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.12.0 Version: 1.12.1
Release: 2%{?dist} Release: 1%{?dist}
#Group: Development/Libraries #Group: Development/Libraries
License: GPLv3+ and MIT and BSD and Python License: GPLv3+ and MIT and BSD and Python
@ -139,7 +139,7 @@ BuildRequires: %{ansible_build_dep}
#%%defcommit 4 02fc72b482e165472624b2f68eecd2ddce1d93b1 #%%defcommit 4 02fc72b482e165472624b2f68eecd2ddce1d93b1
%global rolename4 kdump %global rolename4 kdump
%deftag 4 1.2.0 %deftag 4 1.2.2
%defcommit 5 be8e38a5c614ab7438508b81435f0a1407039406 %defcommit 5 be8e38a5c614ab7438508b81435f0a1407039406
%global rolename5 network %global rolename5 network
@ -197,7 +197,7 @@ BuildRequires: %{ansible_build_dep}
#%%defcommit 18 5f6cb73e6753fbdbb219b7d3079f0378b2d3bdb3 #%%defcommit 18 5f6cb73e6753fbdbb219b7d3079f0378b2d3bdb3
%global rolename18 vpn %global rolename18 vpn
%deftag 18 1.3.0 %deftag 18 1.3.1
%global rolename19 firewall %global rolename19 firewall
%deftag 19 1.0.1 %deftag 19 1.0.1
@ -205,7 +205,7 @@ BuildRequires: %{ansible_build_dep}
%global rolename20 cockpit %global rolename20 cockpit
%deftag 20 1.1.2 %deftag 20 1.1.2
%global mainid 792c7c0a5633b0a41edf7b1cb4d97963a585e508 %global mainid 32ab2252be64d5e71454b83dc2c701d22168bef4
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}
@ -450,6 +450,9 @@ mkdir .collections
"https://access.redhat.com/articles/3050101" \ "https://access.redhat.com/articles/3050101" \
"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
rm lsr_role2collection/collection_requirements.txt
# but leave bindep.txt for now
%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" \
@ -460,6 +463,10 @@ mv galaxy.yml.tmp galaxy.yml
includes="" includes=""
for role in %{rolenames}; do for role in %{rolenames}; do
includes="$includes --include $role" includes="$includes --include $role"
%if 0%{?rhel}
# we vendor-in all of the dependencies on rhel, so remove them
rm -f "$role/meta/requirements.yml"
%endif
done done
LANG=en_US.utf-8 LC_ALL=en_US.utf-8 python3 release_collection.py --galaxy-yml galaxy.yml \ LANG=en_US.utf-8 LC_ALL=en_US.utf-8 python3 release_collection.py --galaxy-yml galaxy.yml \
@ -714,6 +721,15 @@ fi
%endif %endif
%changelog %changelog
* Tue Feb 8 2022 Rich Megginson <rmeggins@redhat.com> - 1.12.1-1
- vpn - template error while templating string: no filter named 'vpn_ipaddr'
Resolves rhbz#2052103 (EL8)
Resolves rhbz#2050341 (EL9)
- kdump - Unable to start service kdump: Job for kdump.service failed because the control process exited with error code.
Resolves rhbz#2052105 (EL8)
Resolves rhbz#2050419 (EL9)
- remove collection dependencies on rhel because we vendor them in
* Thu Feb 3 2022 Rich Megginson <rmeggins@redhat.com> - 1.12.0-2 * Thu Feb 3 2022 Rich Megginson <rmeggins@redhat.com> - 1.12.0-2
- RHEL8.6, 9 - add "Requires: ansible-core or ansible" - RHEL8.6, 9 - add "Requires: ansible-core or ansible"
Resolves rhbz#2012316 (EL8) Resolves rhbz#2012316 (EL8)