diff --git a/.gitignore b/.gitignore index 374d520..c60ecba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,13 @@ SOURCES/certificate-fedef6e.tar.gz SOURCES/kdump-0c2bb28.tar.gz -SOURCES/kernel_settings-b8bc86b.tar.gz -SOURCES/logging-e629293.tar.gz -SOURCES/metrics-bed326c.tar.gz -SOURCES/nbde_client-4020978.tar.gz +SOURCES/kernel_settings-901a73a.tar.gz +SOURCES/logging-fe3f658.tar.gz +SOURCES/metrics-7f94b49.tar.gz +SOURCES/nbde_client-6306def.tar.gz SOURCES/nbde_server-4b6cfca.tar.gz -SOURCES/network-e0c7d55.tar.gz +SOURCES/network-bf4501b.tar.gz SOURCES/postfix-0.1.tar.gz SOURCES/selinux-6cd1ec8.tar.gz -SOURCES/storage-878de13.tar.gz +SOURCES/storage-81f30ab.tar.gz SOURCES/timesync-924650d.tar.gz SOURCES/tlog-cfa70b6.tar.gz diff --git a/.rhel-system-roles.metadata b/.rhel-system-roles.metadata index 3bb8c04..a34a76e 100644 --- a/.rhel-system-roles.metadata +++ b/.rhel-system-roles.metadata @@ -1,13 +1,13 @@ 5aa98ec9e109c5ebfae327718e5cad1d3c837e4f SOURCES/certificate-fedef6e.tar.gz 36b200d1c6a8d1cb1ea87e3e9aa8c4f6bbd8155d SOURCES/kdump-0c2bb28.tar.gz -27144f3b423aa51b7a6ffeaee4c2d23c99fda614 SOURCES/kernel_settings-b8bc86b.tar.gz -0029b279a1f1a96ca52e130378ad0c0a3a15ea62 SOURCES/logging-e629293.tar.gz -7fb9e7b8991e82886e0b9f6a7ad3f91722796ecf SOURCES/metrics-bed326c.tar.gz -dddead857f422156a0623c44be258dfed4cb8711 SOURCES/nbde_client-4020978.tar.gz +263a6bbe7b25fbbc13c60b6b30861b63ec2648cd SOURCES/kernel_settings-901a73a.tar.gz +9f365ee569d0d6e542983842ffd7c81c82e2c3ca SOURCES/logging-fe3f658.tar.gz +3c25f49356e9325ba694d14ece036c8ea3aa16f6 SOURCES/metrics-7f94b49.tar.gz +435fed277e03b6c409ebbfa421c15f97ba15e8c8 SOURCES/nbde_client-6306def.tar.gz e936390ddc7440e25190d6ff98cf5e5b3bf1fc3b SOURCES/nbde_server-4b6cfca.tar.gz -5a9597aa5142df3564dd3d85c3bebc1bb62f465d SOURCES/network-e0c7d55.tar.gz +d1e3e5cd724e7a61a9b3f4eb2bf669d6ed6f9cde SOURCES/network-bf4501b.tar.gz 66c82331f4ac9598c506c3999965b4d07dbfe49d SOURCES/postfix-0.1.tar.gz 246383bd6823533ed3a51a0501b75e38ba852908 SOURCES/selinux-6cd1ec8.tar.gz -a8c3f22a2d9f0ff8a6e63d6ad9b7e138f1086391 SOURCES/storage-878de13.tar.gz +d1ba125b693ac5b8705e79d92b13f24c01c51a86 SOURCES/storage-81f30ab.tar.gz ffd2a706e4e3007684aa9874c8457ad5c8920050 SOURCES/timesync-924650d.tar.gz 66538d3279cb5972f73a70960a4407d2abe56883 SOURCES/tlog-cfa70b6.tar.gz diff --git a/SOURCES/network-nm-reload-profile.diff b/SOURCES/network-nm-reload-profile.diff deleted file mode 100644 index 8920653..0000000 --- a/SOURCES/network-nm-reload-profile.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/tests/playbooks/tests_ethtool_features.yml b/tests/playbooks/tests_ethtool_features.yml -index 9b51cab..57c48bd 100644 ---- a/tests/playbooks/tests_ethtool_features.yml -+++ b/tests/playbooks/tests_ethtool_features.yml -@@ -186,6 +186,9 @@ - - include_tasks: tasks/manage_test_interface.yml - vars: - state: absent -+ - name: Reload NetworkManager config -+ command: nmcli connection reload -+ ignore_errors: true - tags: - - "tests::cleanup" - diff --git a/SOURCES/network-tier1-tags.diff b/SOURCES/network-tier1-tags.diff index 582c071..803d4f1 100644 --- a/SOURCES/network-tier1-tags.diff +++ b/SOURCES/network-tier1-tags.diff @@ -22,6 +22,30 @@ index 9cce1ae..76d99e9 100644 + hosts: all + tasks: + - import_tasks: tasks/restore_state.yml +diff --git a/tests/playbooks/tests_bond.yml b/tests/playbooks/tests_bond.yml +index ab3ee43..d646a0b 100644 +--- a/tests/playbooks/tests_bond.yml ++++ b/tests/playbooks/tests_bond.yml +@@ -1,5 +1,10 @@ + # SPDX-License-Identifier: BSD-3-Clause + --- ++- name: Save host state ++ hosts: all ++ tasks: ++ - import_tasks: tasks/save_state.yml ++ + - hosts: all + vars: + master_profile: bond0 +@@ -94,3 +99,8 @@ + - import_tasks: tasks/remove_test_interfaces_with_dhcp.yml + tags: + - "tests::cleanup" ++ ++- name: Restore host state ++ hosts: all ++ tasks: ++ - import_tasks: tasks/restore_state.yml diff --git a/tests/playbooks/tests_bridge.yml b/tests/playbooks/tests_bridge.yml index d79d6ad..c8cf3cd 100644 --- a/tests/playbooks/tests_bridge.yml @@ -172,7 +196,7 @@ index cd02579..adcffee 100644 + tasks: + - import_tasks: tasks/restore_state.yml diff --git a/tests/playbooks/tests_ethtool_features.yml b/tests/playbooks/tests_ethtool_features.yml -index 76b0f8a..9b51cab 100644 +index 43fddc3..d1a87fe 100644 --- a/tests/playbooks/tests_ethtool_features.yml +++ b/tests/playbooks/tests_ethtool_features.yml @@ -1,5 +1,10 @@ @@ -185,8 +209,8 @@ index 76b0f8a..9b51cab 100644 + - hosts: all vars: - interface: lsrfeat1 -@@ -183,3 +188,8 @@ + interface: testnic1 +@@ -198,3 +203,8 @@ state: absent tags: - "tests::cleanup" @@ -195,6 +219,30 @@ index 76b0f8a..9b51cab 100644 + hosts: all + tasks: + - import_tasks: tasks/restore_state.yml +diff --git a/tests/playbooks/tests_provider.yml b/tests/playbooks/tests_provider.yml +index 1db2d08..e097b4b 100644 +--- a/tests/playbooks/tests_provider.yml ++++ b/tests/playbooks/tests_provider.yml +@@ -1,5 +1,10 @@ + # SPDX-License-Identifier: BSD-3-Clause + --- ++- name: Save host state ++ hosts: all ++ tasks: ++ - import_tasks: tasks/save_state.yml ++ + - hosts: all + vars: + interface: testnic1 +@@ -33,3 +38,8 @@ + - tasks/cleanup_profile+device.yml + tags: + - tests::provider:initscripts_to_nm ++ ++- name: Restore host state ++ hosts: all ++ tasks: ++ - import_tasks: tasks/restore_state.yml diff --git a/tests/playbooks/tests_reapply.yml b/tests/playbooks/tests_reapply.yml index 4b1cb09..6995607 100644 --- a/tests/playbooks/tests_reapply.yml @@ -221,10 +269,10 @@ index 4b1cb09..6995607 100644 + tasks: + - import_tasks: tasks/restore_state.yml diff --git a/tests/playbooks/tests_states.yml b/tests/playbooks/tests_states.yml -index 5926ad0..e936d4e 100644 +index eec27c0..a8d0ecd 100644 --- a/tests/playbooks/tests_states.yml +++ b/tests/playbooks/tests_states.yml -@@ -135,3 +135,18 @@ +@@ -135,3 +135,23 @@ - tasks/cleanup_profile+device.yml tags: - tests::states:remove_down_twice @@ -234,12 +282,17 @@ index 5926ad0..e936d4e 100644 + import_tasks: tasks/save_state.yml + + post_tasks: -+ - name: Remove test bridge in case it is still lingering -+ command: 'ip link delete "{{ interface }}"' ++ - name: Remove test profile + tags: + - 'tests::cleanup' + - 'tests::net::bridge::cleanup' -+ ignore_errors: yes ++ import_role: ++ name: linux-system-roles.network ++ vars: ++ network_connections: ++ - name: statebr ++ state: down ++ persistent_state: absent + + - name: Restore host state + import_tasks: tasks/restore_state.yml diff --git a/SOURCES/rhel-system-roles-storage-prefix.diff b/SOURCES/rhel-system-roles-storage-prefix.diff index 8bd9ea1..7855b38 100644 --- a/SOURCES/rhel-system-roles-storage-prefix.diff +++ b/SOURCES/rhel-system-roles-storage-prefix.diff @@ -2,7 +2,7 @@ diff --git a/README.md b/README.md index c2debc9..d9e40b3 100644 --- a/README.md +++ b/README.md -@@ -81,7 +81,7 @@ Example Playbook +@@ -154,7 +154,7 @@ Example Playbook - hosts: all roles: diff --git a/SPECS/rhel-system-roles.spec b/SPECS/rhel-system-roles.spec index d3e66a4..a89c24a 100644 --- a/SPECS/rhel-system-roles.spec +++ b/SPECS/rhel-system-roles.spec @@ -5,7 +5,7 @@ Name: linux-system-roles %endif Summary: Set of interfaces for unified system management Version: 1.0 -Release: 17%{?dist} +Release: 19%{?dist} #Group: Development/Libraries License: GPLv3+ and MIT and BSD @@ -42,15 +42,15 @@ License: GPLv3+ and MIT and BSD %global rolename3 timesync #%%deftag 3 1.0.0 -%defcommit 5 e0c7d550a9934b837c45997ce9adef425bce6bcf +%defcommit 5 bf4501bb8770d3ef761e1684011c905f99a9752f %global rolename5 network #%%deftag 5 1.0.0 -%defcommit 6 878de13ba508a1a21e54781cb3181bb1596b8c24 +%defcommit 6 81f30ab336f4ecc61b4a30ffcb080e17fd35de2e %global rolename6 storage #%%deftag 6 1.0.2 -%defcommit 7 bed326c5cd410a6088b8071d5c20c391ba1f8090 +%defcommit 7 7f94b49688902eb507e0ebeda1fbf08621bc3c6b %global rolename7 metrics #%%deftag 7 0.1.0 @@ -58,11 +58,11 @@ License: GPLv3+ and MIT and BSD %global rolename8 tlog #%%deftag 8 0.2.0 -%defcommit 9 b8bc86b70b49bf703205a145b3905a827a41230c +%defcommit 9 901a73a4285469ef50a6cc37135ae55ce9d2e41b %global rolename9 kernel_settings #%%deftag 9 0.2.0 -%defcommit 10 e6292930d4881f6f0af42931b37d271cbf70b41c +%defcommit 10 fe3f658e72b2883d2a1460d453105c7a53dd70e8 %global rolename10 logging #%%deftag 10 0.2.0 @@ -70,7 +70,7 @@ License: GPLv3+ and MIT and BSD %global rolename11 nbde_server #%%deftag 11 0.1.0 -%defcommit 12 402097869d691409840282f6f5f30eb9b4d272a9 +%defcommit 12 6306defad146d8274b04f438a04e17e44672f1a6 %global rolename12 nbde_client #%%deftag 12 0.1.0 @@ -116,7 +116,6 @@ Patch31: timesync-tier1-tags.diff Patch52: network-permissions.diff Patch53: network-tier1-tags.diff -Patch54: network-nm-reload-profile.diff #Patch61: storage-safemode.diff @@ -177,7 +176,6 @@ cd %{rolename5}-%{id5} %endif %patch52 -p1 %patch53 -p1 -%patch54 -p1 cd .. cd %{rolename6}-%{id6} %if "%{roleprefix}" != "linux-system-roles." @@ -188,11 +186,15 @@ cd .. # for some roles, the prefix change can be scripted - see below %if "%{roleprefix}" != "linux-system-roles." -for role in %{rolename7}-%{id7} %{rolename8}-%{id8} %{rolename9}-%{id9} \ +for rolename_id in %{rolename7}-%{id7} %{rolename8}-%{id8} %{rolename9}-%{id9} \ %{rolename10}-%{id10} %{rolename11}-%{id11} %{rolename12}-%{id12} \ %{rolename13}-%{id13}; do - find $role -type f -exec \ - sed "s/linux-system-roles[.]${role}\\>/%{roleprefix}${role}/g" -i {} \; + # assumes rolename has no dash in it + # note that we have to use double %% + # in order for a single % to be passed to bash + rolename=${rolename_id%%-*} + find $rolename_id -type f -exec \ + sed "s/linux-system-roles[.]${rolename}\\>/%{roleprefix}${rolename}/g" -i {} \; done %endif @@ -456,6 +458,21 @@ cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}certificate/README.m %license %{_datadir}/ansible/roles/%{roleprefix}certificate/LICENSE %changelog +* Mon Aug 24 2020 Pavel Cahyna - 1.0-19 +- Rebase network role to latest upstream, resolves rhbz#1800627 + Drop a downstream patch with a test workaround that is not needed anymore. +- Fix script for role prefix transformation +- Rebase metrics role to pick up test changes, PR #19 +- Rebase kernel_settings role to latest upstream, resolves rhbz#1851557 + +* Mon Aug 24 2020 Pavel Cahyna - 1.0-18 +- Rebase storage role to latest upstream, resolves rhbz#1848254, rhbz#1851654, + rhbz#1862867 +- Rebase nbde_client role to latest upstream, resolves rhbz#1851654 +- Rebase logging role to latest upstream, resolves rhbz#1851654, rhbz#1861318 +- Rebase metrics role to latest upstream, resolves rhbz#1869390, rhbz#1869389, + rhbz#1868378 + * Fri Aug 21 2020 Pavel Cahyna - 1.0-17 - Rebase certificate role to latest upstream, resolves rhbz#1859547