From 32b08ed8d032815fc838c8caef6c05635da8e1ce Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Feb 01 2022 18:21:47 +0000 Subject: import resource-agents-4.10.0-5.el9 --- diff --git a/SOURCES/bz2029753-podman-remove-anonymous-volumes.patch b/SOURCES/bz2029753-podman-remove-anonymous-volumes.patch new file mode 100644 index 0000000..f5ad417 --- /dev/null +++ b/SOURCES/bz2029753-podman-remove-anonymous-volumes.patch @@ -0,0 +1,22 @@ +From c6338011cf9ea69324f44c8c31a4ca2478aab35a Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Tue, 7 Dec 2021 08:59:50 +0100 +Subject: [PATCH] podman: remove anonymous volumes + +--- + heartbeat/podman | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/heartbeat/podman b/heartbeat/podman +index fd901c968..2b73857f1 100755 +--- a/heartbeat/podman ++++ b/heartbeat/podman +@@ -251,7 +251,7 @@ remove_container() + return 0 + fi + ocf_log notice "Cleaning up inactive container, ${CONTAINER}." +- ocf_run podman rm $CONTAINER ++ ocf_run podman rm -v $CONTAINER + rc=$? + if [ $rc -ne 0 ]; then + # due to a podman bug (rhbz#1841485), sometimes a stopped diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec index 4ce05ee..4c70fbb 100644 --- a/SPECS/resource-agents.spec +++ b/SPECS/resource-agents.spec @@ -45,7 +45,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.10.0 -Release: 4%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 5%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/resource-agents Source0: %{upstream_prefix}-%{upstream_version}.tar.gz @@ -55,6 +55,7 @@ Patch2: bz2021125-gcp-ilb-1-fix-log_enable.patch Patch3: bz2021125-gcp-ilb-2-only-check-log_cmd-if-log-enabled.patch Patch4: bz2029796-Route-return-OCF_NOT_RUNNING-missing-route.patch Patch5: bz2029704-db2-crm_attribute-use-forever.patch +Patch6: bz2029753-podman-remove-anonymous-volumes.patch # bundled ha-cloud-support libs Patch500: ha-cloud-support-aws.patch @@ -184,6 +185,7 @@ exit 1 %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 # bundled ha-cloud-support libs %patch500 -p1 @@ -513,6 +515,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog +* Wed Jan 5 2022 Oyvind Albrigtsen - 4.10.0-5 +- podman: remove anonymous volumes + + Resolves: rhbz#2029753 + * Tue Dec 7 2021 Oyvind Albrigtsen - 4.10.0-4 - Route: return OCF_NOT_RUNNING for probe action when interface or route doesnt exist