From b661c418e33e4eacc2b7ce38edae44e857d546f9 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 28 Jun 2022 04:30:04 -0400
Subject: [PATCH] import resource-agents-4.10.0-9.el9_0.3

---
 ...cuate-add-user_domain-project_domain.patch | 61 +++++++++++++++++++
 SPECS/resource-agents.spec                    | 12 +++-
 2 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 SOURCES/bz2087930-NovaEvacuate-add-user_domain-project_domain.patch

diff --git a/SOURCES/bz2087930-NovaEvacuate-add-user_domain-project_domain.patch b/SOURCES/bz2087930-NovaEvacuate-add-user_domain-project_domain.patch
new file mode 100644
index 0000000..f187bbb
--- /dev/null
+++ b/SOURCES/bz2087930-NovaEvacuate-add-user_domain-project_domain.patch
@@ -0,0 +1,61 @@
+From 340e12c0d457d244d375c2d805e78033c9dbdf78 Mon Sep 17 00:00:00 2001
+From: Takashi Kajinami <tkajinam@redhat.com>
+Date: Wed, 04 May 2022 23:13:35 +0900
+Subject: [PATCH] NovaCompute/Evacuate: Make user/project domain configurable
+
+... so that we can use a user or a project in a non-default keystone
+domain.
+
+Change-Id: I6e2175adca08fd97942cb83b8f8094e980b60c9d
+---
+
+diff --git a/heartbeat/NovaEvacuate b/heartbeat/NovaEvacuate
+index 596f520..4565766 100644
+--- a/heartbeat/NovaEvacuate
++++ b/heartbeat/NovaEvacuate
+@@ -63,13 +63,29 @@
+ 
+ <parameter name="tenant_name" unique="0" required="1">
+ <longdesc lang="en">
+-Tenant name for connecting to keystone in admin context.
++Tenant(Project) name for connecting to keystone in admin context.
+ Note that with Keystone V3 tenant names are only unique within a domain.
+ </longdesc>
+ <shortdesc lang="en">Tenant name</shortdesc>
+ <content type="string" default="" />
+ </parameter>
+ 
++<parameter name="user_domain" unique="0" required="0">
++<longdesc lang="en">
++Keystone domain the user belongs to
++</longdesc>
++<shortdesc lang="en">Keystone v3 User Domain</shortdesc>
++<content type="string" default="" />
++</parameter>
++
++<parameter name="project_domain" unique="0" required="0">
++<longdesc lang="en">
++Keystone domain the tenant(project) belongs to
++</longdesc>
++<shortdesc lang="en">Keystone v3 Project Domain</shortdesc>
++<content type="string" default="" />
++</parameter>
++
+ <parameter name="domain" unique="0" required="0">
+ <longdesc lang="en">
+ DNS domain in which hosts live, useful when the cluster uses short names and nova uses FQDN
+@@ -319,6 +335,14 @@
+ 
+     fence_options="${fence_options} -t ${OCF_RESKEY_tenant_name}"
+ 
++    if [ -n "${OCF_RESKEY_user_domain}" ]; then
++        fence_options="${fence_options} -u ${OCF_RESKEY_user_domain}"
++    fi
++
++    if [ -n "${OCF_RESKEY_project_domain}" ]; then
++        fence_options="${fence_options} -P ${OCF_RESKEY_project_domain}"
++    fi
++
+     if [ -n "${OCF_RESKEY_domain}" ]; then
+         fence_options="${fence_options} -d ${OCF_RESKEY_domain}"
+     fi
diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec
index 05de3a5..58fa083 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:	9%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	9%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.3
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 Source0:	%{upstream_prefix}-%{upstream_version}.tar.gz
@@ -61,6 +61,7 @@ Patch8: 	bz2055016-1-IPsrcaddr-dhcp-warning.patch
 Patch9: 	bz2055016-2-IPsrcaddr-error-message-route-not-found.patch
 Patch10:	bz2055016-3-IPsrcaddr-fix-indentation.patch
 Patch11:	bz2055016-4-IPsrcaddr-fixes.patch
+Patch12:	bz2087930-NovaEvacuate-add-user_domain-project_domain.patch
 
 # bundled ha-cloud-support libs
 Patch500:	ha-cloud-support-aws.patch
@@ -196,6 +197,7 @@ exit 1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 # bundled ha-cloud-support libs
 %patch500 -p1
@@ -489,7 +491,8 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 %exclude %{_mandir}/man8/ocf-tester.8*
 # ldirectord is not supported
 %exclude /etc/ha.d/resource.d/ldirectord
-%exclude /etc/rc.d/init.d/ldirectord
+%exclude %{_sysconfdir}/init.d/ldirectord
+%exclude %{_sysconfdir}/rc.d/init.d/ldirectord
 %exclude %{_unitdir}/ldirectord.service
 %exclude /etc/logrotate.d/ldirectord
 %exclude /usr/sbin/ldirectord
@@ -525,6 +528,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
+* Thu Jun  9 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-9.3
+- NovaEvacuate: add user_domain and project_domain parameters
+
+  Resolves: rhbz#2087930
+
 * Thu Mar  3 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-9
 - IPsrcaddr: add warning about possible issues when used with DHCP,
   and add error message when matching route not found