From 52c415a1da6e0016671913c941cafe21bff6737e Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Thu, 12 Aug 2021 11:51:04 -0600 Subject: [PATCH] drop support for ansible 2.8; fix sshd el6 bug 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) --- linux-system-roles.spec | 55 ++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/linux-system-roles.spec b/linux-system-roles.spec index 5b559f0..1110cb6 100644 --- a/linux-system-roles.spec +++ b/linux-system-roles.spec @@ -21,7 +21,7 @@ Name: linux-system-roles %endif Url: https://github.com/linux-system-roles Summary: Set of interfaces for unified system management -Version: 1.7.6 +Version: 1.8.0 Release: 1%{?dist} #Group: Development/Libraries @@ -109,79 +109,79 @@ BuildRequires: ansible >= 2.9.10 #%%defcommit 1 14314822b529520ac12964e0d2938c4bb18ab895 %global rolename1 postfix -%deftag 1 1.0.0 +%deftag 1 1.1.0 #%%defcommit 2 9fe6eb36772e83b53dcfb8ceb73608fd4f72eeda %global rolename2 selinux -%deftag 2 1.2.3 +%deftag 2 1.3.0 #%%defcommit 3 8db8f9ed9088432bac7abf68f1b284475a3baa38 %global rolename3 timesync -%deftag 3 1.5.0 +%deftag 3 1.6.0 #%%defcommit 4 02fc72b482e165472624b2f68eecd2ddce1d93b1 %global rolename4 kdump -%deftag 4 1.0.5 +%deftag 4 1.1.0 -%defcommit 5 b08a0b3748ee87aa3bdbcf1f0b7e41ef4971bbee +#%%defcommit 5 b08a0b3748ee87aa3bdbcf1f0b7e41ef4971bbee %global rolename5 network -#%%deftag 5 1.0.0 +%deftag 5 1.4.0 #%%defcommit 6 b3b456183edb7b8aa6ceff7ce667d8e22009ef6a %global rolename6 storage -%deftag 6 1.5.3 +%deftag 6 1.6.0 #%%defcommit 7 0673d842fb32c437501e2aada2e38921da98e115 %global rolename7 metrics -%deftag 7 1.2.4 +%deftag 7 1.3.0 #%%defcommit 8 2b9e53233ee3a68bdb532e62f289733e436a6106 %global rolename8 tlog -%deftag 8 1.1.1 +%deftag 8 1.2.0 #%%defcommit 9 9373303b98e09ef38df7afc8d06e5e55812096c7 %global rolename9 kernel_settings -%deftag 9 1.0.4 +%deftag 9 1.1.0 #%%defcommit 10 20dd3e5520ca06dcccaa9b3f1fb428d055e0c23f %global rolename10 logging -%deftag 10 1.4.1 +%deftag 10 1.5.0 #%%defcommit 11 c57d0b1f3384c525738fa26ba4bdca485e162567 %global rolename11 nbde_server -%deftag 11 1.0.3 +%deftag 11 1.1.0 #%%defcommit 12 bef2fad5e365712d1f40e53662490ba2550a253f %global rolename12 nbde_client -%deftag 12 1.0.4 +%deftag 12 1.1.0 #%%defcommit 13 310fc53db04e8d3134524afb7a89b0477a2ffb83 %global rolename13 certificate -%deftag 13 1.0.5 +%deftag 13 1.1.0 #%%defcommit 14 b2a9857ac661fa32e66666e444b73bfdb34cdf95 %global rolename14 crypto_policies -%deftag 14 1.1.0 +%deftag 14 1.2.0 %global forgeorg15 https://github.com/willshersystems %global repo15 ansible-sshd %global rolename15 sshd -#%%defcommit 15 32f9d0dda5a801cbefad09214ec2d88b6838b943 -%deftag 15 v0.13.1 +%defcommit 15 1c5c48835e01adc176febf945e1fd36b7d9af7fd +#%%deftag 15 v0.13.1 #%%defcommit 16 59b9fd7b25607d8bd33bdb082748955f2652846a %global rolename16 ssh -%deftag 16 1.0.2 +%deftag 16 1.1.0 #%%defcommit 17 f901239cb91878719c9e7461760ef8d4789d626d %global rolename17 ha_cluster -%deftag 17 1.2.0 +%deftag 17 1.3.0 #%%defcommit 18 5f6cb73e6753fbdbb219b7d3079f0378b2d3bdb3 %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 Source1: %{archiveurl1} Source2: %{archiveurl2} @@ -290,7 +290,8 @@ cd %{rolename5} cd .. cd %{rolename15} 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 .. # Replacing "linux-system-roles.rolename" with "rhel-system-roles.rolename" in each role @@ -615,6 +616,14 @@ fi %endif %changelog +* Thu Aug 12 2021 Rich Megginson - 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 - 1.7.6-1 - storage - tests_create_lvmvdo_then_remove fails - Module dm-vdo not found Resolves rhbz#1991141 (EL8)