From d1739a45b4447dea8b199c71fae4c7105c69c854 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 03 2019 13:23:11 +0000
Subject: import resource-agents-4.1.1-30.el7_7.2


---

diff --git a/SOURCES/bz1744923-SAPHanaTopology-make-multi-instance-aware.patch b/SOURCES/bz1744923-SAPHanaTopology-make-multi-instance-aware.patch
new file mode 100644
index 0000000..c4fbd7c
--- /dev/null
+++ b/SOURCES/bz1744923-SAPHanaTopology-make-multi-instance-aware.patch
@@ -0,0 +1,49 @@
+From d43d8af650ee9ed175ebd4fdfc15ac2767734a8d Mon Sep 17 00:00:00 2001
+From: Fabian Herschel <fabian.herschel@suse.com>
+Date: Wed, 25 Jul 2018 12:30:32 +0200
+Subject: [PATCH] ra/SAPHanaTopology: bsc#1016691 "SAPHanaSR: Status file of
+ SAPHanaTopology is not multi instance aware (MCOS)"
+
+---
+ SAPHana/ra/SAPHanaTopology | 20 +++++++++++---------
+ 1 file changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/SAPHanaSR-2067519/SAPHana/ra/SAPHanaTopology b/SAPHanaSR-2067519/SAPHana/ra/SAPHanaTopology
+index 1e2f301..20d2593 100755
+--- a/SAPHanaSR-2067519/SAPHana/ra/SAPHanaTopology
++++ b/SAPHanaSR-2067519/SAPHana/ra/SAPHanaTopology
+@@ -28,7 +28,7 @@
+ #######################################################################
+ #
+ # Initialization:
+-SAPHanaVersion="0.152.21"
++SAPHanaVersion="0.152.22"
+ timeB=$(date '+%s')
+ 
+ : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
+@@ -736,15 +736,17 @@ function sht_start() {
+ # sht_stop: Stop the SAP HANA Topology Resource
+ #
+ function sht_stop() {
+-  super_ocf_log info "FLOW $FUNCNAME ($*)"
+-  local output=""
+-  local rc=0
+-
+-  rm $HA_RSCTMP/SAPHana/SAPTopologyON.${SID}
+-  rc=$OCF_SUCCESS
++    super_ocf_log info "FLOW $FUNCNAME ($*)"
++    local output=""
++    local rc=0
++    if [ -f $HA_RSCTMP/SAPHana/SAPTopologyON ]; then
++        rm $HA_RSCTMP/SAPHana/SAPTopologyON
++    fi
++    rm $HA_RSCTMP/SAPHana/SAPTopologyON.${SID}
++    rc=$OCF_SUCCESS
+ 
+-  super_ocf_log info "FLOW $FUNCNAME rc=$rc"
+-  return $rc
++    super_ocf_log info "FLOW $FUNCNAME rc=$rc"
++    return $rc
+ }
+ 
+ 
diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec
index 8786e1e..a7d6fe7 100644
--- a/SPECS/resource-agents.spec
+++ b/SPECS/resource-agents.spec
@@ -95,7 +95,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.1.1
-Release:	30%{?dist}.1
+Release:	30%{?dist}.2
 License:	GPLv2+ and LGPLv2+ and ASL 2.0
 URL:		https://github.com/ClusterLabs/resource-agents
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -176,6 +176,7 @@ Patch55:	bz1363902-SAPHanaSR-monitor-fix-tolower-error.patch
 Patch56:	bz1731426-dhcpd-keep-selinux-context.patch
 Patch57:	bz1731427-CTDB-1-fixes.patch
 Patch58:	bz1731427-CTDB-2-add-v4.9-support.patch
+Patch59:	bz1744923-SAPHanaTopology-make-multi-instance-aware.patch
 
 # bundle patches
 Patch1000:	bz1568588-7-gcp-bundled.patch
@@ -370,7 +371,7 @@ SAP instances to be managed in a cluster environment.
 License:	GPLv2+
 Summary:	SAP HANA Scale-Out cluster resource agents
 Version:	0.163.2
-Release:	7%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.1
+Release:	7%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.2
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
 Group:		System Environment/Base
 %else
@@ -390,7 +391,7 @@ environment.
 License:	GPLv2+
 Summary:	SAP cluster connector script
 Version:	3.0.1
-Release:	7%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.1
+Release:	7%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.2
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
 Group:		System Environment/Base
 %else
@@ -473,6 +474,7 @@ exit 1
 %patch56 -p1
 %patch57 -p1
 %patch58 -p1 -F1
+%patch59 -p1
 
 # add SAPHana agents to Makefile.am
 mv %{saphana_prefix}-%{saphana_hash}/SAPHana/ra/SAPHana* heartbeat
@@ -1103,6 +1105,11 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %endif
 
 %changelog
+* Fri Aug 23 2019 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.1.1-30.2
+- SAPHanaTopology: make multi instance aware (MCOS)
+
+  Resolves: rhbz#1744923
+
 * Mon Jul 22 2019 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.1.1-30.1
 - dhcpd: keep SELinux context in chroot
 - CTDB: add support for v4.9+