diff --git a/.gitignore b/.gitignore index 3549b1a..5f9851d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,20 @@ SOURCES/ansible-posix-1.3.0.tar.gz SOURCES/ansible-sshd-214df35c0bee77b5d69f49c2da269251d451b28f.tar.gz -SOURCES/auto-maintenance-07860ebb58a41f294b5ff41b1b5ab8f358cd9513.tar.gz +SOURCES/auto-maintenance-5e7bb389fc5e93184871b3907e75ba896874dc21.tar.gz SOURCES/certificate-1.1.3.tar.gz SOURCES/cockpit-1.2.1.tar.gz -SOURCES/community-general-4.4.0.tar.gz +SOURCES/community-general-4.6.0.tar.gz SOURCES/crypto_policies-1.2.3.tar.gz SOURCES/firewall-1.1.0.tar.gz SOURCES/ha_cluster-1.4.1.tar.gz SOURCES/kdump-1.2.2.tar.gz SOURCES/kernel_settings-1.1.6.tar.gz SOURCES/logging-1.8.1.tar.gz -SOURCES/metrics-1.4.1.tar.gz +SOURCES/metrics-1.5.1.tar.gz SOURCES/nbde_client-1.2.0.tar.gz SOURCES/nbde_server-1.1.2.tar.gz -SOURCES/network-61423ed36fc6da6dbe8321912e896c59a2d8e2f6.tar.gz -SOURCES/postfix-1.1.3.tar.gz +SOURCES/network-1.7.1.tar.gz +SOURCES/postfix-1.2.0.tar.gz SOURCES/selinux-1.3.4.tar.gz SOURCES/ssh-1.1.4.tar.gz SOURCES/storage-1.7.0.tar.gz diff --git a/.rhel-system-roles.metadata b/.rhel-system-roles.metadata index 15b0078..df28108 100644 --- a/.rhel-system-roles.metadata +++ b/.rhel-system-roles.metadata @@ -1,20 +1,20 @@ d2d2382c38eaf34d2295aba2aa4652d75ebbaeef SOURCES/ansible-posix-1.3.0.tar.gz a4d4556cf6628e87fa62dec6c46099338b499930 SOURCES/ansible-sshd-214df35c0bee77b5d69f49c2da269251d451b28f.tar.gz -b64ad3ed71082042aa9cbaf3b4cf4f98240429a6 SOURCES/auto-maintenance-07860ebb58a41f294b5ff41b1b5ab8f358cd9513.tar.gz +a2ec14498a7fd213f08dd24ca139039c958b07fd SOURCES/auto-maintenance-5e7bb389fc5e93184871b3907e75ba896874dc21.tar.gz cee41b5fd6359e9ddeb83c5af7b8057fef6b2334 SOURCES/certificate-1.1.3.tar.gz 004064268df0e7dd154331b7799272d3277388d4 SOURCES/cockpit-1.2.1.tar.gz -a7a5fb799f9446f27f1d19c6b1610bbe13c6ae04 SOURCES/community-general-4.4.0.tar.gz +ad8684050c86bad7ce4882a84e14be6867a56d8d SOURCES/community-general-4.6.0.tar.gz 0684c1335923ba8ebbb05afbd507e5ff31f874d6 SOURCES/crypto_policies-1.2.3.tar.gz fcb8d48ccaeba886859ce6afd3d14bbb3f8a5667 SOURCES/firewall-1.1.0.tar.gz 9a990a4908bdf3269bce4f214907623780a5e221 SOURCES/ha_cluster-1.4.1.tar.gz a1c9c89dea1dbe2410465c29ad0e1d3637ac5f52 SOURCES/kdump-1.2.2.tar.gz 0a681d1e3b236c4750d663f2a833e786a5e958ab SOURCES/kernel_settings-1.1.6.tar.gz e530528ba5f9478cc8604aa6612388ea8e5078af SOURCES/logging-1.8.1.tar.gz -c0dbbea68bba05ee98c3e1a686c328e741abe763 SOURCES/metrics-1.4.1.tar.gz +430ce63a7b45b97305e4f8591192fa7e58af8292 SOURCES/metrics-1.5.1.tar.gz 641ab2f8cd9916a43c8b580907203a3304110d1e SOURCES/nbde_client-1.2.0.tar.gz 33f0a3ea008021e69b2bbd7b25f6536f91e7613d SOURCES/nbde_server-1.1.2.tar.gz -85817484d16946dcc268ea3d5ef103fc688797d8 SOURCES/network-61423ed36fc6da6dbe8321912e896c59a2d8e2f6.tar.gz -19b7356c0857acd54956a08132d8dd67a4c071d4 SOURCES/postfix-1.1.3.tar.gz +dcd2261fe6b6a998aca3eb6c968204152e2ffd51 SOURCES/network-1.7.1.tar.gz +95c54da9ef5acaae9553f2c4ed250452502ab9e0 SOURCES/postfix-1.2.0.tar.gz 4e5c5216814577ee55304721e5c811ed8857efbc SOURCES/selinux-1.3.4.tar.gz f38972c4b22a9f226b58725c7e9ba8fac692bba2 SOURCES/ssh-1.1.4.tar.gz 0728b4e01261f84ce470431a4ea21907db75f26a SOURCES/storage-1.7.0.tar.gz diff --git a/SOURCES/metrics-symlink_follow.diff b/SOURCES/metrics-symlink_follow.diff deleted file mode 100644 index bbb713f..0000000 --- a/SOURCES/metrics-symlink_follow.diff +++ /dev/null @@ -1,44 +0,0 @@ -From e7cc032dae8b740428b334eac179b4aa243f0aea Mon Sep 17 00:00:00 2001 -From: "github-actions[bot]" - <41898282+github-actions[bot]@users.noreply.github.com> -Date: Tue, 1 Mar 2022 02:35:22 +0000 -Subject: [PATCH] Squashed 'vendor/github.com/performancecopilot/ansible-pcp/' - changes from 2da846b..e41f4bd - -e41f4bd Merge branch 'nhosoi-ansible_managed' -49337e0 Add "follow: yes" to the template task in the mssql and elasticsearch subrole. - -git-subtree-dir: vendor/github.com/performancecopilot/ansible-pcp -git-subtree-split: e41f4bd98809ae49534e3f24feec3ce9c49c86ed ---- - roles/elasticsearch/tasks/main.yml | 1 + - roles/mssql/tasks/main.yml | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/roles/elasticsearch/tasks/main.yml b/roles/elasticsearch/tasks/main.yml -index 2ca9768..d806fad 100644 ---- a/roles/elasticsearch/tasks/main.yml -+++ b/roles/elasticsearch/tasks/main.yml -@@ -45,6 +45,7 @@ - template: - src: elasticsearch.conf.j2 - dest: "{{ __elasticsearch_conf }}" -+ follow: yes - mode: 0600 - when: - - elasticsearch_metrics_provider == 'pcp' -diff --git a/roles/mssql/tasks/main.yml b/roles/mssql/tasks/main.yml -index e951d1e..d6c9525 100644 ---- a/roles/mssql/tasks/main.yml -+++ b/roles/mssql/tasks/main.yml -@@ -34,6 +34,7 @@ - template: - src: mssql.conf.j2 - dest: "{{ __mssql_conf }}" -+ follow: yes - mode: 0600 - when: mssql_metrics_provider == 'pcp' - --- -2.34.1 - diff --git a/SPECS/rhel-system-roles.spec b/SPECS/rhel-system-roles.spec index e02c8fd..d1f22c7 100644 --- a/SPECS/rhel-system-roles.spec +++ b/SPECS/rhel-system-roles.spec @@ -30,7 +30,7 @@ Name: linux-system-roles %endif Url: https://github.com/linux-system-roles Summary: Set of interfaces for unified system management -Version: 1.15.1 +Version: 1.16.1 Release: 1%{?dist} #Group: Development/Libraries @@ -127,7 +127,7 @@ BuildRequires: %{ansible_build_dep} #%%defcommit 1 14314822b529520ac12964e0d2938c4bb18ab895 %global rolename1 postfix -%deftag 1 1.1.3 +%deftag 1 1.2.0 #%%defcommit 2 9fe6eb36772e83b53dcfb8ceb73608fd4f72eeda %global rolename2 selinux @@ -141,17 +141,17 @@ BuildRequires: %{ansible_build_dep} %global rolename4 kdump %deftag 4 1.2.2 -%defcommit 5 61423ed36fc6da6dbe8321912e896c59a2d8e2f6 +#%%defcommit 5 61423ed36fc6da6dbe8321912e896c59a2d8e2f6 %global rolename5 network -#%%deftag 5 1.7.0 +%deftag 5 1.7.1 #%%defcommit 6 50d2b8ccc98a8f4cb9d1d550d21adc227181e9fa %global rolename6 storage %deftag 6 1.7.0 -#%%defcommit 7 0673d842fb32c437501e2aada2e38921da98e115 +#%%defcommit 7 d57caa8ca506d8cbc7ca0f96f7cb62b7e965f163 %global rolename7 metrics -%deftag 7 1.4.1 +%deftag 7 1.5.1 #%%defcommit 8 2b9e53233ee3a68bdb532e62f289733e436a6106 %global rolename8 tlog @@ -205,7 +205,7 @@ BuildRequires: %{ansible_build_dep} %global rolename20 cockpit %deftag 20 1.2.1 -%global mainid 07860ebb58a41f294b5ff41b1b5ab8f358cd9513 +%global mainid 5e7bb389fc5e93184871b3907e75ba896874dc21 Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz Source1: %{archiveurl1} Source2: %{archiveurl2} @@ -234,7 +234,7 @@ Source801: ansible-posix-1.3.0.tar.gz # Collection tarballs from Galaxy # Not used on Fedora. -Source901: community-general-4.4.0.tar.gz +Source901: community-general-4.6.0.tar.gz # Script to convert the collection README to Automation Hub. # Not used on Fedora. @@ -242,8 +242,6 @@ Source998: collection_readme.sh Patch51: network-disable-bondtests.diff -Patch71: metrics-symlink_follow.diff - BuildArch: noarch %if %{with html} @@ -352,7 +350,6 @@ if [ "$rolesdir" != "$realrolesdir" ]; then mv "$realrolesdir" . rm -rf vendor fi -%patch71 -p1 cd .. %if 0%{?rhel} @@ -713,6 +710,36 @@ fi %endif %changelog +* Fri Mar 18 2022 Rich Megginson - 1.16.1-1 +- network - pytest failed when running with nm providers in the rhel-8.5 beaker machine + Resolves rhbz#2064396 (EL8) + Resolves rhbz#2064401 (EL9) +- network - bond: fix typo in supporting the infiniband ports in active-backup modekernel_settings error configobj not found on RHEL 8.6 managed hosts + Resolves rhbz#2064388 (EL8) + Resolves rhbz#2064391 (EL9) +- network - consistently use ansible_managed in configuration files managed by role + Resolves rhbz#2057656 (EL8) + Resolves rhbz#2057657 (EL9) + +* Thu Mar 17 2022 Rich Megginson - 1.16.0-3 +- remove unneeded metrics patch due to rebase + +* Thu Mar 17 2022 Rich Megginson - 1.16.0-2 +- remove unneeded metrics patch due to rebase +- fix bogus date in changelog + +* Tue Mar 15 2022 Rich Megginson - 1.16.0-1 +- metrics - consistently use ansible_managed in configuration files managed by role + Resolves rhbz#2057645 (EL8) + Resolves rhbz#2057647 (EL9) +- postfix - consistently use ansible_managed in configuration files managed by role + Resolves rhbz#2057661 (EL8) + Resolves rhbz#2057662 (EL9) +- postfix - provide the ability to replace config and reset configuration back to default + Resolves rhbz#2044657 (EL8) + Resolves rhbz#2058780 (EL9) +- new tags required in galaxy.yml for Automation Hub + * Thu Mar 3 2022 Rich Megginson - 1.15.1-1 - kernel_settings error configobj not found on RHEL 8.6 managed hosts Resolves rhbz#2058772 (EL8) @@ -726,7 +753,7 @@ fi Resolves rhbz#2058655 (EL8) Resolves rhbz#2058777 (EL9) -* Tue Feb 20 2022 Rich Megginson - 1.15.0-1 +* Tue Feb 22 2022 Rich Megginson - 1.15.0-1 - firewall - ensure target changes take effect immediately Resolves rhbz#2057172 (EL8) Resolves rhbz#2057164 (EL9)