From 30f80daf981283f3e25ed689d2b53518519db722 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Thu, 14 Jul 2022 12:41:52 +0200
Subject: [PATCH] -
 openstack-cinder-volume/openstack-floating-ip/openstack-info/  
 openstack-virtual-ip: new resource agents

  Resolves: rhbz#2083081, rhbz#2083086, rhbz#2083090, rhbz#2083092
---
 ...agents-set-domain-parameters-default.patch | 55 +++++++++++++++++++
 resource-agents.spec                          |  6 +-
 2 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 bz2083081-bz2083086-bz2083090-bz2083092-openstack-agents-set-domain-parameters-default.patch

diff --git a/bz2083081-bz2083086-bz2083090-bz2083092-openstack-agents-set-domain-parameters-default.patch b/bz2083081-bz2083086-bz2083090-bz2083092-openstack-agents-set-domain-parameters-default.patch
new file mode 100644
index 0000000..8ee70e5
--- /dev/null
+++ b/bz2083081-bz2083086-bz2083090-bz2083092-openstack-agents-set-domain-parameters-default.patch
@@ -0,0 +1,55 @@
+From bb5cfa172ca58cd8adcedcaca92bde54d0645661 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Thu, 14 Jul 2022 10:55:19 +0200
+Subject: [PATCH] openstack-agents: set domain parameter's default to Default
+ and fix missing parameter name in ocf_exit_reason
+
+---
+ heartbeat/openstack-common.sh | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/heartbeat/openstack-common.sh b/heartbeat/openstack-common.sh
+index b6eec09c..14d290bd 100644
+--- a/heartbeat/openstack-common.sh
++++ b/heartbeat/openstack-common.sh
+@@ -1,6 +1,10 @@
++OCF_RESKEY_user_domain_name_default="Default"
++OCF_RESKEY_project_domain_name_default="Default"
+ OCF_RESKEY_openstackcli_default="/usr/bin/openstack"
+ OCF_RESKEY_insecure_default="false"
+ 
++: ${OCF_RESKEY_user_domain_name=${OCF_RESKEY_user_domain_name_default}}
++: ${OCF_RESKEY_project_domain_name=${OCF_RESKEY_project_domain_name_default}}
+ : ${OCF_RESKEY_openstackcli=${OCF_RESKEY_openstackcli_default}}
+ : ${OCF_RESKEY_insecure=${OCF_RESKEY_insecure_default}}
+ 
+@@ -64,7 +68,7 @@ Keystone Project.
+ Keystone User Domain Name.
+ </longdesc>
+ <shortdesc lang="en">Keystone User Domain Name</shortdesc>
+-<content type="string" />
++<content type="string" default="${OCF_RESKEY_user_domain_name_default}" />
+ </parameter>
+ 
+ <parameter name="project_domain_name" required="0">
+@@ -72,7 +76,7 @@ Keystone User Domain Name.
+ Keystone Project Domain Name.
+ </longdesc>
+ <shortdesc lang="en">Keystone Project Domain Name</shortdesc>
+-<content type="string" />
++<content type="string" default="${OCF_RESKEY_project_domain_name_default}" />
+ </parameter>
+ 
+ <parameter name="openstackcli">
+@@ -133,7 +137,7 @@ get_config() {
+ 			exit $OCF_ERR_CONFIGURED
+ 		fi
+ 		if [ -z "$OCF_RESKEY_project_domain_name" ]; then
+-			ocf_exit_reason " not set"
++			ocf_exit_reason "project_domain_name not set"
+ 			exit $OCF_ERR_CONFIGURED
+ 		fi
+ 
+-- 
+2.36.1
+
diff --git a/resource-agents.spec b/resource-agents.spec
index 883654e..3557bce 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -45,7 +45,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.10.0
-Release:	19%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	20%{?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
@@ -74,6 +74,7 @@ Patch21:	bz2063877-all-agents-use-promotable-terms.patch
 Patch22:	bz2083090-openstack-info-fix-bashism.patch
 Patch23:	bz2083081-bz2083086-bz2083092-openstack-agents-fixes.patch
 Patch24:	bz2083081-bz2083086-bz2083090-bz2083092-openstack-agents-warn-when-openstackcli-slow.patch
+Patch25:	bz2083081-bz2083086-bz2083090-bz2083092-openstack-agents-set-domain-parameters-default.patch
 
 # bundled ha-cloud-support libs
 Patch500:	ha-cloud-support-aws.patch
@@ -222,6 +223,7 @@ exit 1
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
 
 # bundled ha-cloud-support libs
 %patch500 -p1
@@ -544,7 +546,7 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
-* Tue Jul 12 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-19
+* Thu Jul 14 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-20
 - openstack-cinder-volume/openstack-floating-ip/openstack-info/
   openstack-virtual-ip: new resource agents