- openstack-cinder-volume: wait for volume to be available

Resolves: RHEL-69734

RHEL-69734-2-openstack-cinder-volume-fix-detach-not-working-during-start-action.patch

@@ -0,0 +1,44 @@
+From d89b3fb29033c3a60eb0896033af5981c7b9f64a Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Fri, 10 Jan 2025 11:39:48 +0100
+Subject: [PATCH] openstack-cinder-volume: fix detach not working during
+ start-action after #2000
+
+---
+ heartbeat/openstack-cinder-volume | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/heartbeat/openstack-cinder-volume b/heartbeat/openstack-cinder-volume
+index 2b64d4d88..5bb1acddd 100755
+--- a/heartbeat/openstack-cinder-volume
++++ b/heartbeat/openstack-cinder-volume
+@@ -142,9 +142,9 @@ osvol_monitor() {
+ 	node_id=$(_get_node_id)
+ 
+ 	if ocf_is_true $OCF_RESKEY_volume_local_check ; then
+-		if [ "$__OCF_ACTION" = "monitor" ] || [ "$__OCF_ACTION" = "start" ] ; then
++		if [ "$__OCF_ACTION" = "monitor" ] || [ "$1" = "quick" ]; then
+ 			#
+-			# Is the volue attached?
++			# Is the volume attached?
+ 			# We check the local devices
+ 			#
+ 			short_volume_id=$(echo $OCF_RESKEY_volume_id | awk '{print substr($0, 0, 20)}')
+@@ -158,7 +158,7 @@ osvol_monitor() {
+ 	fi
+ 
+ 	#
+-	# Is the volue attached?
++	# Is the volume attached?
+ 	# We use the API
+ 	#
+ 	result=$(run_openstackcli "volume show \
+@@ -249,7 +249,7 @@ osvol_start() {
+ 		return $OCF_ERR_GENERIC
+ 	fi
+ 
+-	while ! osvol_monitor; do
++	while ! osvol_monitor quick; do
+ 		ocf_log info "Waiting for cinder volume $OCF_RESKEY_volume_id to appear on $node_id"
+ 		sleep 1
+ 	done

resource-agents.spec

@@ -45,7 +45,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.10.0
-Release:	70%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	71%{?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
@@ -146,7 +146,8 @@ Patch93:	RHEL-42513-powervs-subnet-new-ra.patch
 Patch94: 	RHEL-66292-1-aws-agents-reuse-imds-token-until-it-expires.patch
 Patch95: 	RHEL-66292-2-aws-agents-reuse-imds-token-improvements.patch
 Patch96: 	RHEL-68739-awsvip-add-interface-parameter.patch
-Patch97:	RHEL-69734-openstack-cinder-volume-wait-for-volume-to-be-available.patch
+Patch97:	RHEL-69734-1-openstack-cinder-volume-wait-for-volume-to-be-available.patch
+Patch98:	RHEL-69734-2-openstack-cinder-volume-fix-detach-not-working-during-start-action.patch
 
 # bundled ha-cloud-support libs
 Patch500:	ha-cloud-support-aliyun.patch
@@ -368,6 +369,7 @@ exit 1
 %patch -p1 -P 95
 %patch -p1 -P 96
 %patch -p1 -P 97
+%patch -p1 -P 98
 
 # bundled ha-cloud-support libs
 %patch -p1 -P 500
@@ -697,7 +699,7 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
-* Tue Jan  7 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-70
+* Fri Jan 10 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-71
 - openstack-cinder-volume: wait for volume to be available
 
   Resolves: RHEL-69734