network role changes for release 1.21.0 - part 2

make network role support ansible-core 2.14
fix md to adoc to html conversion for vpn and ha_cluster

network - [RFE] Support setting the metric of the default route for initscripts provider
Resolves:rhbz#2134202

network - [RFE] Support the DNS priority
Resolves:rhbz#2133858

network - Support looking up named route table in routing rule
Resolves:rhbz#2131293

network - tests_bond_options_nm.yml failing, Cannot find device "nm-bond"
Resolves:rhbz#2123311

.gitignore

@@ -354,3 +354,8 @@
 /community-general-5.8.0.tar.gz
 /auto-maintenance-638594eaa311325b74147e216718c1c0ec3b92fd.tar.gz
 /network-1.10.0.tar.gz
+/network-1.10.1.tar.gz
+/ha_cluster-1.8.1.tar.gz
+/vpn-1.5.1.tar.gz
+/auto-maintenance-e3ac549bee05349d7ae033971448f861415ad608.tar.gz
+/community-general-6.0.1.tar.gz

linux-system-roles.spec

@@ -30,7 +30,7 @@ Name: linux-system-roles
 Url: https://github.com/linux-system-roles
 Summary: Set of interfaces for unified system management
 Version: 1.21.0
-Release: 0.1.network%{?dist}
+Release: 0.2.network%{?dist}
 
 License: GPLv3+ and MIT and BSD and Python
 %global _pkglicensedir %{_licensedir}/%{name}
@@ -125,7 +125,7 @@ Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0)
 
 #%%defcommit 5 a74092634adfe45f76cf761138abab1811692b4b
 %global rolename5 network
-%deftag 5 1.10.0
+%deftag 5 1.10.1
 
 #%%defcommit 6 50d2b8ccc98a8f4cb9d1d550d21adc227181e9fa
 %global rolename6 storage
@@ -175,11 +175,11 @@ Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0)
 
 #%%defcommit 17 f901239cb91878719c9e7461760ef8d4789d626d
 %global rolename17 ha_cluster
-%deftag 17 1.7.4
+%deftag 17 1.8.1
 
 #%%defcommit 18 5f6cb73e6753fbdbb219b7d3079f0378b2d3bdb3
 %global rolename18 vpn
-%deftag 18 1.3.5
+%deftag 18 1.5.1
 
 %global rolename19 firewall
 %deftag 19 1.4.0
@@ -187,7 +187,7 @@ Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0)
 %global rolename20 cockpit
 %deftag 20 1.3.0
 
-%global mainid 638594eaa311325b74147e216718c1c0ec3b92fd
+%global mainid e3ac549bee05349d7ae033971448f861415ad608
 Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz
 Source1: %{archiveurl1}
 Source2: %{archiveurl2}
@@ -214,11 +214,11 @@ Source20: %{archiveurl20}
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/SourceURL/#_do_not_conditionalize_sources
 # Collections to vendor on RHEL only, Fedora has these available from RPMs
 Source801: https://galaxy.ansible.com/download/ansible-posix-1.4.0.tar.gz
-Source901: https://galaxy.ansible.com/download/community-general-5.8.0.tar.gz
+Source901: https://galaxy.ansible.com/download/community-general-6.0.1.tar.gz
 #Source902: https://galaxy.ansible.com/download/containers-podman-1.9.4.tar.gz
 %if 0%{?rhel}
 Provides: bundled(ansible-collection(ansible.posix)) = 1.4.0
-Provides: bundled(ansible-collection(community.general)) = 5.8.0
+Provides: bundled(ansible-collection(community.general)) = 6.0.1
 #Provides: bundled(ansible-collection(containers.podman)) = 1.9.4
 %endif
 
@@ -232,6 +232,8 @@ Source997: spec-to-changelog-md.sh
 # RHEL only, script to convert the collection README from Galaxy to Automation Hub
 Source998: collection_readme.sh
 
+Patch51: network-disable-bondtests.diff
+
 Patch1501: 0001-sshd-Add-final-version-of-RequiredRSASize.patch
 
 Patch1601: 0001-ssh-Add-final-version-of-the-option-RequiredRSASize-53.patch
@@ -274,6 +276,23 @@ Summary: Collection artifact to import to Automation Hub / Ansible Galaxy
 Collection artifact for %{name}. This package contains %{collection_namespace}-%{collection_name}-%{version}.tar.gz
 %endif
 
+# Fix issue with package update introduce with changing symlink to directory
+# in 1.21.1-5
+%pretrans -p <lua>
+roles = {
+    "certificate", "cockpit", "crypto_policies", "firewall", "ha_cluster",
+    "kdump", "kernel_settings", "logging", "metrics", "nbde_client",
+    "nbde_server", "network", "postfix", "selinux", "ssh", "sshd", "storage",
+    "timesync", "tlog", "vpn"
+}
+for i,v in ipairs(roles) do
+    path = "/usr/share/ansible/roles/linux-system-roles." .. v
+    st = posix.stat(path)
+    if st and st.type == "link" then
+      os.remove(path)
+    end
+end
+
 %prep
 %setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -n %{getarchivedir 0}
 
@@ -314,6 +333,10 @@ sed -r -i -e '/hosts: all/a\
     - tests::avc' tests_selinux_disabled.yml
 cd ../..
 
+cd %{rolename5}
+%patch51 -p1
+cd ..
+
 cd %{rolename15}
 find -P tests examples -name \*.yml | while read file; do
   sed -r -i -e "s/ansible-sshd/linux-system-roles.sshd/" \
@@ -471,7 +494,8 @@ for role in %{rolenames}; do
     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" "$role/meta/collection-requirements.yml"
+    rm -f "$role/meta/requirements.yml" "$role/meta/collection-requirements.yml" \
+      "$role/tests/collection-requirements.yml"
 %endif
 done
 
@@ -717,6 +741,17 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \
 %endif
 
 %changelog
+* Tue Nov 15 2022 Rich Megginson <rmeggins@redhat.com> - 1.21.0-0.2.network
+- Resolves:rhbz#2134202 : network - [RFE] Support setting the metric of the default route for initscripts provider
+- Resolves:rhbz#2133858 : network - [RFE] Support the DNS priority
+- Resolves:rhbz#2131293 : network - Support looking up named route table in routing rule
+- Resolves:rhbz#2123311 : network - tests_bond_options_nm.yml failing, Cannot find device "nm-bond"
+- includes ha_cluster, vpn - README.md had headings that were too long causing problems
+  for md to adoc to html conversion on el8
+- includes changing network role to support ansible-core 2.14
+- includes community.general 6.0.1
+- adds back network bondtests patch - bond tests still failing in beaker
+
 * Tue Nov 08 2022 Rich Megginson <rmeggins@redhat.com> - 1.21.0-0.1.network
 - Resolves:rhbz#2134202 : network - [RFE] Support setting the metric of the default route for initscripts provider
 - Resolves:rhbz#2133858 : network - [RFE] Support the DNS priority

sources

@@ -1,23 +1,23 @@
 SHA512 (ansible-posix-1.4.0.tar.gz) = 669261538e2b0e4598f148abb63138b18e92599a56cd48d523a259ac5253a9fc9abb7eb6bf5a792bfcdedcaeaa240acde916b19045317b3e7e8561e1190b6a2e
 SHA512 (ansible-sshd-9766d9097a87a130d4c8abde2247aaad5c925ecf.tar.gz) = 4169ed02f4ab8dba6004c0ace7c4132b4028db60f5a8daa73dc312653f78088d1324406239982ddb9525771de0f99b1d2594cc00bac314d6ec245fa8d2af17cb
-SHA512 (auto-maintenance-638594eaa311325b74147e216718c1c0ec3b92fd.tar.gz) = 35f955b5783b840a2e6d0f8dc15b35de6f177d5fb358706e608307b9ff10b9bffdf24bb192fda9f8bea4c7e26c758d95ede403cc4a5d1d7644378234d3a8cda3
+SHA512 (auto-maintenance-e3ac549bee05349d7ae033971448f861415ad608.tar.gz) = 540f86046dfba3fa58942f9f544d01963c501da69c245757e5161ef78533bee10b0ccfd69781254918b042cfa4eac83cbe527c7d8b8dd45a076f80eac8fbfccf
 SHA512 (certificate-1.1.6.tar.gz) = c37b00b1a0c3f6c01447ced8c66bc37b97f08d6994020ae855781535858fc1765d5bb44279e285787d71f5b804a3cb1d5e90eb037c780ce0741e2e8d29008793
 SHA512 (cockpit-1.3.0.tar.gz) = 74e80b742d4e78add88d64caf1a622849bcef1659a463cfd0456bb0c20105462e8131849fc2a15465db846de6d9a15b53490d2e323579d476809e47377e26694
-SHA512 (community-general-5.8.0.tar.gz) = 280fee8cf8437a538fe75eda117eba2d07740e8f5ae15a3795e57eb286a667e598233638e6d0479b1f0e917fc01e266c44c40b5b17530bbf8cc9301c99a4b76b
+SHA512 (community-general-6.0.1.tar.gz) = 0f171634062cf4865606d9c770372d06dcccfb57df584fbbd7efdd24cbb5dca69c1cacf102dd6f4bcaecbe63c87c54908dbd72cad2fedd13f5185d12afd714ec
 SHA512 (crypto_policies-1.2.6.tar.gz) = bf16a89dca4475b658b8bc8a1d84b2b900b23a5c5440180aa29d56d67e8bdc4f3f7bc0f1acc316e7f1aa3662b0a685532bc179b6aee6e92f5b64d553a942318b
 SHA512 (firewall-1.4.0.tar.gz) = 8159829a2ae5e9fd795165179b5fb8542727193dc489e78950d50c6554e926027ab340733f9ad8f83debaae9a8f55331d0016a6d023ce8e4e11534587ee41250
-SHA512 (ha_cluster-1.7.4.tar.gz) = df962d21fd219efd251ef0cd5c72195ecfd467f8901f0c65418574768532c39fd63bcb2d273af300039cd786775c9d620994b98a3e42eb0dc75633c0392ed8b2
+SHA512 (ha_cluster-1.8.1.tar.gz) = f6ae98323ee78e0642fd1797416c0215a03339184388c014551366253c8d120e89b290bdd6b48fc525c75afb3626a76160c5b9978da9916c56da817c7cfdba2a
 SHA512 (kdump-1.2.5.tar.gz) = 3f8df4917f8cc2421c8e351f36332e38a18677ce3db135fc5ea2e78809194ebc793324e5091726d09e70a7e02a81fa6bc4456062878da903efbcbcebba97f707
 SHA512 (kernel_settings-1.1.10.tar.gz) = e3a2d4298bbe160b106f5b90b2ee065404ca0e437f6928f6fe82aa92b9a9140bda73d16a72f6eab3d5e472fb7f7c0c066918e4dc75b53673a9e7f45b570c33a1
 SHA512 (logging-1.10.0.tar.gz) = 0042354cd2635a05f292763c2462b34e1d677681dee510cd0142378f3ca0009b7444e63dd3429c7c019577abd01307e4e22fe0d49b57543afe13de790fd454c2
 SHA512 (metrics-1.7.3.tar.gz) = 07df961ff1c42255f692e0ff5fa163167aef7ab5a99da030b6d522ee99dd21725e1dcc2d8ad7cd90b97bf228bbfcadba8925dd2e371ea7efc1c8c1331d170c72
 SHA512 (nbde_client-1.2.6.tar.gz) = 0e05735e4de708aa771079ccda75a13db96b565032d465cb9df7f31f8371091b7f297e257ca778e2fbcc6dfd76524f9b35acaae22b55d20dd96c696b84a6d08a
 SHA512 (nbde_server-1.1.5.tar.gz) = 25e7824368f02b41f08ba44318c56696e3edf11caed10e4416728c5e8fbc2e0e8c39a9d619031eba4293a139d6c0f4815a0534f3713f950a730212b3606677d8
-SHA512 (network-1.10.0.tar.gz) = df3328a9b331cd5aacbb092e31503fd146ae023c9aa3c41136a934d00cb3b53873ed830d1187721ca64686d13b8bb937019e2e2fd6954977f3ad91d7062b5e7f
+SHA512 (network-1.10.1.tar.gz) = 5f7b049bf9a2dfc4b2cbce4b019cf02d59e17c378cb2d2790ed1dd0e1d38866b04aa23b73a73b7375aa8d18a173c53e2e2af9ad66f283e1eaf92589cff2d1f01
 SHA512 (postfix-1.2.4.tar.gz) = 8b44036c2220de31e6fb94f5ec30e94cd73133d820df151fcd91e6932ec274c90ac7c91c8e40f13d0fd8a972baa5a0eb1f58340cf310a91ac9134c4ae8f559d1
 SHA512 (selinux-1.4.0.tar.gz) = 29be414a8cbb85ea8a650865bd4f1e6a3d0935f58c7a9139094b73ab6c736ef06318ea95f1877bb8868fd56aaa54f944193d9abeb833e6915f9fbe44af07b8f6
 SHA512 (ssh-1.1.9.tar.gz) = c08a5f43c0ee80b9eaeee365a9f2c648c080c53ee9d1714f7cb37d41822998fe31d442473cc9ed797ac4eb893b10e656c929b8eef94bcd9c7e39f47877e304e1
 SHA512 (storage-1.9.1.tar.gz) = 71657dd83794867f01d46498487f1545704df484220d8465479244cee734529862bf59b3e2ff88d82f8bff73fc069b58f5431d14c709cb5a92bac8080d9bb593
 SHA512 (timesync-1.6.9.tar.gz) = 44af98baf10442ee2adc77f02f7cfd3e0397fe1eb2593917d65b78a7df0b2f8e367680894c8e83c9c96217338473ec31a600196208db7809eeeda82580cc9c41
 SHA512 (tlog-1.2.9.tar.gz) = 3cf7f5ec876bd72ba3bb3b5b563c499e046cf8207a74ea6533b60be4b6a9947125873ad6f87d79f379e0864187f3916f39adeb3a49d038d07617bb3222c0d329
-SHA512 (vpn-1.3.5.tar.gz) = 29c01ac2a1af8b33f14798f3424505b29a1e4b4c00661a0c0871fa6da7799e22e05a4ed90801ec1b7ffbb9e05ed8440768ecb1860a69d396111e6f5e5c32b1a5
+SHA512 (vpn-1.5.1.tar.gz) = f30c1e549d47d1c97e43239270c751ace6584e9dda20bff27f54c77898deaea0728a2f218bf2245c744f4a7a3004275dd6543df1c6a594e2f07d8c48705e5842