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

drop support for ansible 2.8; fix sshd el6 bug

Browse Source 
drop support for Ansible 2.8 - min_ansible_version is now 2.9
Resolves: rhbz#1989197 (EL9)

sshd - fix rhel6 support - failed to validate: error:Missing Match criteria for all Bad Match condition
Resolves: rhbz#1991598 (EL9)

(cherry picked from commit 86144623e53d9187029d9e82fdc65872322c64d8)
This commit is contained in:
Rich Megginson 2021-08-12 11:51:04 -06:00
parent ce769979cf
commit 52c415a1da
1 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
linux-system-roles.spec
View File

@ -21,7 +21,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.7.6 Version: 1.8.0
Release: 1%{?dist} Release: 1%{?dist}
#Group: Development/Libraries #Group: Development/Libraries
@ -109,79 +109,79 @@ BuildRequires: ansible >= 2.9.10
#%%defcommit 1 14314822b529520ac12964e0d2938c4bb18ab895 #%%defcommit 1 14314822b529520ac12964e0d2938c4bb18ab895
%global rolename1 postfix %global rolename1 postfix
%deftag 1 1.0.0 %deftag 1 1.1.0
#%%defcommit 2 9fe6eb36772e83b53dcfb8ceb73608fd4f72eeda #%%defcommit 2 9fe6eb36772e83b53dcfb8ceb73608fd4f72eeda
%global rolename2 selinux %global rolename2 selinux
%deftag 2 1.2.3 %deftag 2 1.3.0
#%%defcommit 3 8db8f9ed9088432bac7abf68f1b284475a3baa38 #%%defcommit 3 8db8f9ed9088432bac7abf68f1b284475a3baa38
%global rolename3 timesync %global rolename3 timesync
%deftag 3 1.5.0 %deftag 3 1.6.0
#%%defcommit 4 02fc72b482e165472624b2f68eecd2ddce1d93b1 #%%defcommit 4 02fc72b482e165472624b2f68eecd2ddce1d93b1
%global rolename4 kdump %global rolename4 kdump
%deftag 4 1.0.5 %deftag 4 1.1.0
%defcommit 5 b08a0b3748ee87aa3bdbcf1f0b7e41ef4971bbee #%%defcommit 5 b08a0b3748ee87aa3bdbcf1f0b7e41ef4971bbee
%global rolename5 network %global rolename5 network
#%%deftag 5 1.0.0 %deftag 5 1.4.0
#%%defcommit 6 b3b456183edb7b8aa6ceff7ce667d8e22009ef6a #%%defcommit 6 b3b456183edb7b8aa6ceff7ce667d8e22009ef6a
%global rolename6 storage %global rolename6 storage
%deftag 6 1.5.3 %deftag 6 1.6.0
#%%defcommit 7 0673d842fb32c437501e2aada2e38921da98e115 #%%defcommit 7 0673d842fb32c437501e2aada2e38921da98e115
%global rolename7 metrics %global rolename7 metrics
%deftag 7 1.2.4 %deftag 7 1.3.0
#%%defcommit 8 2b9e53233ee3a68bdb532e62f289733e436a6106 #%%defcommit 8 2b9e53233ee3a68bdb532e62f289733e436a6106
%global rolename8 tlog %global rolename8 tlog
%deftag 8 1.1.1 %deftag 8 1.2.0
#%%defcommit 9 9373303b98e09ef38df7afc8d06e5e55812096c7 #%%defcommit 9 9373303b98e09ef38df7afc8d06e5e55812096c7
%global rolename9 kernel_settings %global rolename9 kernel_settings
%deftag 9 1.0.4 %deftag 9 1.1.0
#%%defcommit 10 20dd3e5520ca06dcccaa9b3f1fb428d055e0c23f #%%defcommit 10 20dd3e5520ca06dcccaa9b3f1fb428d055e0c23f
%global rolename10 logging %global rolename10 logging
%deftag 10 1.4.1 %deftag 10 1.5.0
#%%defcommit 11 c57d0b1f3384c525738fa26ba4bdca485e162567 #%%defcommit 11 c57d0b1f3384c525738fa26ba4bdca485e162567
%global rolename11 nbde_server %global rolename11 nbde_server
%deftag 11 1.0.3 %deftag 11 1.1.0
#%%defcommit 12 bef2fad5e365712d1f40e53662490ba2550a253f #%%defcommit 12 bef2fad5e365712d1f40e53662490ba2550a253f
%global rolename12 nbde_client %global rolename12 nbde_client
%deftag 12 1.0.4 %deftag 12 1.1.0
#%%defcommit 13 310fc53db04e8d3134524afb7a89b0477a2ffb83 #%%defcommit 13 310fc53db04e8d3134524afb7a89b0477a2ffb83
%global rolename13 certificate %global rolename13 certificate
%deftag 13 1.0.5 %deftag 13 1.1.0
#%%defcommit 14 b2a9857ac661fa32e66666e444b73bfdb34cdf95 #%%defcommit 14 b2a9857ac661fa32e66666e444b73bfdb34cdf95
%global rolename14 crypto_policies %global rolename14 crypto_policies
%deftag 14 1.1.0 %deftag 14 1.2.0
%global forgeorg15 https://github.com/willshersystems %global forgeorg15 https://github.com/willshersystems
%global repo15 ansible-sshd %global repo15 ansible-sshd
%global rolename15 sshd %global rolename15 sshd
#%%defcommit 15 32f9d0dda5a801cbefad09214ec2d88b6838b943 %defcommit 15 1c5c48835e01adc176febf945e1fd36b7d9af7fd
%deftag 15 v0.13.1 #%%deftag 15 v0.13.1
#%%defcommit 16 59b9fd7b25607d8bd33bdb082748955f2652846a #%%defcommit 16 59b9fd7b25607d8bd33bdb082748955f2652846a
%global rolename16 ssh %global rolename16 ssh
%deftag 16 1.0.2 %deftag 16 1.1.0
#%%defcommit 17 f901239cb91878719c9e7461760ef8d4789d626d #%%defcommit 17 f901239cb91878719c9e7461760ef8d4789d626d
%global rolename17 ha_cluster %global rolename17 ha_cluster
%deftag 17 1.2.0 %deftag 17 1.3.0
#%%defcommit 18 5f6cb73e6753fbdbb219b7d3079f0378b2d3bdb3 #%%defcommit 18 5f6cb73e6753fbdbb219b7d3079f0378b2d3bdb3
%global rolename18 vpn %global rolename18 vpn
%deftag 18 1.1.0 %deftag 18 1.2.0
%global mainid ec364d2e0bd422b69f34871a1188114f368097a0 %global mainid 2dd50c8a16af647e4c7a768c481335e97735958a
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}
@ -290,7 +290,8 @@ cd %{rolename5}
cd .. cd ..
cd %{rolename15} cd %{rolename15}
sed -r -i -e "s/ansible-sshd/linux-system-roles.sshd/" tests/*.yml examples/*.yml sed -r -i -e "s/ansible-sshd/linux-system-roles.sshd/" tests/*.yml examples/*.yml
sed -r -i -e "s/ willshersystems.sshd/ linux-system-roles.sshd/" tests/*.yml examples/*.yml README.md sed -r -i -e "s/ willshersystems.sshd/ linux-system-roles.sshd/" tests/*.yml examples/*.yml README.md
sed -r -i -e "s/min_ansible_version: 2.8/min_ansible_version: 2.9/" meta/main.yml
cd .. cd ..
# Replacing "linux-system-roles.rolename" with "rhel-system-roles.rolename" in each role # Replacing "linux-system-roles.rolename" with "rhel-system-roles.rolename" in each role
@ -615,6 +616,14 @@ fi
%endif %endif
%changelog %changelog
* Thu Aug 12 2021 Rich Megginson <rmeggins@redhat.com> - 1.8.0-1
- drop support for Ansible 2.8 - min_ansible_version is now 2.9
Resolves rhbz#1989197 (EL9)
Resolves rhbz#1989199 (EL8)
- sshd - fix rhel6 support - failed to validate: error:Missing Match criteria for all Bad Match condition
Resolves rhbz#1991598 (EL9)
Resolves rhbz#1990947 (EL8)
* Tue Aug 10 2021 Rich Megginson <rmeggins@redhat.com> - 1.7.6-1 * Tue Aug 10 2021 Rich Megginson <rmeggins@redhat.com> - 1.7.6-1
- storage - tests_create_lvmvdo_then_remove fails - Module dm-vdo not found - storage - tests_create_lvmvdo_then_remove fails - Module dm-vdo not found
Resolves rhbz#1991141 (EL8) Resolves rhbz#1991141 (EL8)