diff --git a/.gitignore b/.gitignore index ce03a8e..1f47e02 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,10 @@ SOURCES/ansible-sshd-e1de59b3c54e9d48a010eeca73755df339c7e628.tar.gz -SOURCES/auto-maintenance-627b7a83a2c5b2a3c1f775751c689ca40f5fb294.tar.gz +SOURCES/auto-maintenance-20d31bf5d8e7eb67ce48af39e36c9f79d87490e3.tar.gz SOURCES/certificate-19115b5f824141330861359a137d08ac32082502.tar.gz SOURCES/crypto_policies-76b2d5b0460dba22c5d290c1af96e4fdb3434cb9.tar.gz SOURCES/kdump-77596fdd976c6160d6152c200a5432c609725a14.tar.gz SOURCES/kernel_settings-1.0.1.tar.gz -SOURCES/logging-fe3f658e72b2883d2a1460d453105c7a53dd70e8.tar.gz +SOURCES/logging-822c669ad659ef491b83efdcd78a417917c4055d.tar.gz SOURCES/metrics-e81b2650108727f38b1c856699aad26af0f44a46.tar.gz SOURCES/nbde_client-1.0.1.tar.gz SOURCES/nbde_server-1.0.1.tar.gz diff --git a/.rhel-system-roles.metadata b/.rhel-system-roles.metadata index 47bb0d8..f68186b 100644 --- a/.rhel-system-roles.metadata +++ b/.rhel-system-roles.metadata @@ -1,10 +1,10 @@ 77e952b62e634c69e36115845b4f24ee3bfe76b7 SOURCES/ansible-sshd-e1de59b3c54e9d48a010eeca73755df339c7e628.tar.gz -dbf1f7ca7cb0bb6ba7cb7f6f85489591e481337c SOURCES/auto-maintenance-627b7a83a2c5b2a3c1f775751c689ca40f5fb294.tar.gz +20b6439c37c243528f201fedffecc50b677304cb SOURCES/auto-maintenance-20d31bf5d8e7eb67ce48af39e36c9f79d87490e3.tar.gz 83eab43fb47021fc2fcd062d77ad7555bf78b3ab SOURCES/certificate-19115b5f824141330861359a137d08ac32082502.tar.gz 513057251590e81b629a69a4ed704b0976b1bc44 SOURCES/crypto_policies-76b2d5b0460dba22c5d290c1af96e4fdb3434cb9.tar.gz fa3d5daf6cf1ceeaa87f58c16e11153cf250e2fa SOURCES/kdump-77596fdd976c6160d6152c200a5432c609725a14.tar.gz 61be37db19fe593f418e5b69798152f4c5e84cc7 SOURCES/kernel_settings-1.0.1.tar.gz -9f365ee569d0d6e542983842ffd7c81c82e2c3ca SOURCES/logging-fe3f658e72b2883d2a1460d453105c7a53dd70e8.tar.gz +19890ed24ca1fbb17dc3f11d8499ee2b05302587 SOURCES/logging-822c669ad659ef491b83efdcd78a417917c4055d.tar.gz 821d8ebef2d30a41f0fa65bdc5e550f09b375370 SOURCES/metrics-e81b2650108727f38b1c856699aad26af0f44a46.tar.gz 2acad85c458a08a36ca2f2e6b6c12b9b63c42dae SOURCES/nbde_client-1.0.1.tar.gz c55d45d134042b00ece17f2a21bb945c571310b3 SOURCES/nbde_server-1.0.1.tar.gz diff --git a/SOURCES/0001-fix-collection-lookup-problem.patch b/SOURCES/0001-fix-collection-lookup-problem.patch new file mode 100644 index 0000000..af4ead5 --- /dev/null +++ b/SOURCES/0001-fix-collection-lookup-problem.patch @@ -0,0 +1,40 @@ +From 209fa56d14439e049a951995846db9a0f8551222 Mon Sep 17 00:00:00 2001 +From: Rich Megginson +Date: Tue, 9 Feb 2021 09:48:10 -0700 +Subject: [PATCH] fix collection lookup problem + +This fixes the following error: +``` +/bin/sh: line 9: cd: /root/.ansible/collections: No such file or directory +``` +The fix is to ensure the directory exists before attempting +to `cd` to the directory. + +Signed-off-by: Rich Megginson +--- + tests/tasks/get_modules_and_utils_paths.yml | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/tasks/get_modules_and_utils_paths.yml b/tests/tasks/get_modules_and_utils_paths.yml +index 2090b7e..c71f169 100644 +--- a/tests/tasks/get_modules_and_utils_paths.yml ++++ b/tests/tasks/get_modules_and_utils_paths.yml +@@ -50,6 +50,7 @@ + fi + done + for dir in {{ collection_paths | join(" ") }}; do ++ if [ ! -d "$dir" ]; then continue; fi + cd "$dir" + for subdir in ansible_collections/*/*/plugins/modules; do + if [ -f "$subdir/network_connections.py" ]; then +@@ -75,6 +76,7 @@ + fi + done + for dir in {{ collection_paths | join(" ") }}; do ++ if [ ! -d "$dir" ]; then continue; fi + cd "$dir" + for subdir in ansible_collections/*/*/plugins/module_utils; do + if [ -d "$subdir/network_lsr" ]; then +-- +2.29.2 + diff --git a/SOURCES/collection_readme.sh b/SOURCES/collection_readme.sh index 0775282..632d386 100755 --- a/SOURCES/collection_readme.sh +++ b/SOURCES/collection_readme.sh @@ -11,4 +11,5 @@ sed -i -e '/## Currently supported distributions/{:1;/## Dependencies/!{N;b 1};s -e 's/fedora\(.\)linux_system_roles/redhat\1rhel_system_roles/g' \ -e 's/linux-system-roles/rhel-system-roles/g' \ -e '/## Documentation/{:a;/## Support/!{N;b a};s|.*|## Documentation\nThe official RHEL System Roles documentation can be found in the [Product Documentation section of the Red Hat Customer Portal](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/administration_and_configuration_tasks_using_system_roles_in_rhel/index).\n\n## Support|}' \ + -e 's/ $//' \ $readme_md diff --git a/SPECS/rhel-system-roles.spec b/SPECS/rhel-system-roles.spec index 5fc705e..b1fd790 100644 --- a/SPECS/rhel-system-roles.spec +++ b/SPECS/rhel-system-roles.spec @@ -12,7 +12,7 @@ Name: linux-system-roles Url: https://github.com/linux-system-roles/ Summary: Set of interfaces for unified system management Version: 1.0.0 -Release: 26%{?dist} +Release: 27%{?dist} #Group: Development/Libraries License: GPLv3+ and MIT and BSD @@ -115,7 +115,7 @@ Requires: ansible >= 2.9.10 %global rolename9 kernel_settings %deftag 9 1.0.1 -%defcommit 10 fe3f658e72b2883d2a1460d453105c7a53dd70e8 +%defcommit 10 822c669ad659ef491b83efdcd78a417917c4055d %global rolename10 logging #%%deftag 10 0.2.0 @@ -139,7 +139,7 @@ Requires: ansible >= 2.9.10 %global rolename15 sshd %defcommit 15 e1de59b3c54e9d48a010eeca73755df339c7e628 -%global mainid 627b7a83a2c5b2a3c1f775751c689ca40f5fb294 +%global mainid 20d31bf5d8e7eb67ce48af39e36c9f79d87490e3 Source: %{url}auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz Source1: %{archiveurl1} Source2: %{archiveurl2} @@ -175,6 +175,7 @@ Patch51: network-epel-minimal.diff Patch52: network-permissions.diff Patch53: network-tier1-tags.diff Patch55: network-disable-bondtests.diff +Patch56: 0001-fix-collection-lookup-problem.patch Patch62: storage-partition-name.diff @@ -250,6 +251,7 @@ cd %{rolename5} %patch52 -p1 %patch53 -p1 %patch55 -p1 +%patch56 -p1 cd .. cd %{rolename6} %patch62 -p1 @@ -285,16 +287,6 @@ rm %{rolename5}/tests/playbooks/roles find -type f -executable -name '*.py' -exec \ sed -i -r -e '1s@^(#! */usr/bin/env python)(\s|$)@#\13\2@' '{}' + -cat > galaxy.yml < - - Rich Megginson -EOF - %build sh md2html.sh \ %{rolename1}/README.md \ @@ -317,6 +309,8 @@ mkdir .collections %if 0%{?rhel} # Convert the upstream collection readme to the downstream one %{SOURCE998} lsr_role2collection/collection_readme.md +./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" > galaxy.yml.tmp +mv galaxy.yml.tmp galaxy.yml %endif for role in %{rolename1} %{rolename2} %{rolename3} \ %{rolename4} %{rolename5} %{rolename6} \ @@ -329,7 +323,11 @@ for role in %{rolename1} %{rolename2} %{rolename3} \ --namespace %{collection_namespace} --collection %{collection_name} done -cp -p galaxy.yml .collections/ansible_collections/%{collection_namespace}/%{collection_name} +cp -p galaxy.yml lsr_role2collection/.ansible-lint \ + .collections/ansible_collections/%{collection_namespace}/%{collection_name} +mkdir -p .collections/ansible_collections/%{collection_namespace}/%{collection_name}/tests/sanity +cp -p lsr_role2collection/ignore-2.9.txt \ + .collections/ansible_collections/%{collection_namespace}/%{collection_name}/tests/sanity cd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/ %ansible_collection_build @@ -620,6 +618,11 @@ cd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/ %{ansible_collection_files} %changelog +* Thu Feb 11 2021 Pavel Cahyna - 1.0.0-27 +- Rebase the logging role, Resolves rhbz#1889484 +- Fixes to collection docs and galaxy metadata from nhosoi +- Apply network PR #350 Resolves rhbz#1927392 + * Wed Feb 3 2021 Pavel Cahyna - 1.0.0-26 - Rebase the metrics role, Resolves rhbz#1895188, rhbz#1893908