rpms
/
resource-agents-sap-hana
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import resource-agents-sap-hana-0.154.0-7.el8

This commit is contained in:
CentOS Sources 2022-05-10 03:10:21 -04:00 committed by Stepan Oksanichenko
parent 5aee8b6106
commit 2995fc6438
7 changed files with 59 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
SOURCES/bz2043021-1-SAPHana-SAPHanaTopology-add-systemd-support.patch → SOURCES/bz2026273-1-SAPHana-SAPHanaTopology-add-systemd-support.patch
View File

0
SOURCES/bz2043021-2-SAPHana-SAPHanaTopology-suppress-systemctl-output.patch → SOURCES/bz2026273-2-SAPHana-SAPHanaTopology-suppress-systemctl-output.patch
View File

0
SOURCES/bz2043021-3-SAPHana-SAPHanaTopology-fix-unit-test-issue.patch → SOURCES/bz2026273-3-SAPHana-SAPHanaTopology-fix-unit-test-issue.patch
View File

0
SOURCES/bz2027456-1-SAPHana-remove-HANA_CALL_TIMEOUT-parameter.patch → SOURCES/bz2026727-1-SAPHana-remove-HANA_CALL_TIMEOUT-parameter.patch
View File

0
SOURCES/bz2027456-2-SAPHanaTopology-remove-HANA_CALL_TIMEOUT-parameter.patch → SOURCES/bz2026727-2-SAPHanaTopology-remove-HANA_CALL_TIMEOUT-parameter.patch
View File

41
SOURCES/bz2050205-SAPHana-SAPHanaTopology-fix-metadata-version.patch Normal file
View File

@ -0,0 +1,41 @@
From 182dbd793e9c6ce0e5a0abc7d595a864175248bb Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Thu, 20 Jan 2022 10:41:51 +0100
Subject: [PATCH] SAPHana*: follow OCF standard for version and OCF version in
metadata
---
heartbeat/SAPHana | 4 ++--
heartbeat/SAPHanaTopology | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/heartbeat/SAPHana b/heartbeat/SAPHana
index 295eff0..6527362 100755
--- a/heartbeat/SAPHana
+++ b/heartbeat/SAPHana
@@ -160,8 +160,8 @@ function saphana_meta_data() {
cat <<END
<?xml version="1.0"?>
<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
-<resource-agent name="SAPHana">
-<version>$SAPHanaVersion</version>
+<resource-agent name="SAPHana" version="$SAPHanaVersion">
+<version>1.0</version>
<shortdesc lang="en">Manages two SAP HANA database systems in system replication (SR).</shortdesc>
<longdesc lang="en">
diff --git a/heartbeat/SAPHanaTopology b/heartbeat/SAPHanaTopology
index 3fce400..9ad2101 100755
--- a/heartbeat/SAPHanaTopology
+++ b/heartbeat/SAPHanaTopology
@@ -134,8 +134,8 @@ function sht_meta_data() {
cat <<END
<?xml version="1.0"?>
<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
-<resource-agent name="SAPHanaTopology">
- <version>$SAPHanaTopologyVersion</version>
+<resource-agent name="SAPHanaTopology" version="$SAPHanaTopologyVersion">
+ <version>1.0</version>
<shortdesc lang="en">Analyzes SAP HANA System Replication Topology.</shortdesc>
<longdesc lang="en">This RA analyzes the SAP HANA topology and "sends" all findings via the node status attributes to
all nodes in the cluster. These attributes are taken by the SAPHana RA to control the SAP Hana Databases.

28
SPECS/resource-agents-sap-hana.spec
View File

@ -29,7 +29,7 @@ Name: resource-agents-sap-hana
Summary: SAP HANA cluster resource agents
Epoch: 1
Version: 0.154.0
Release: 3%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.3
Release: 7%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
License: GPLv2+
URL: https://github.com/SUSE/SAPHanaSR
%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@ -40,11 +40,12 @@ Group: Productivity/Clustering/HA
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
Source1: %{saphana_prefix}-%{saphana_version}.tar.gz
Patch0: bz1855885-SAPHana-use-actual-mode.patch
Patch1: bz2027456-1-SAPHana-remove-HANA_CALL_TIMEOUT-parameter.patch
Patch2: bz2027456-2-SAPHanaTopology-remove-HANA_CALL_TIMEOUT-parameter.patch
Patch3: bz2043021-1-SAPHana-SAPHanaTopology-add-systemd-support.patch
Patch4: bz2043021-2-SAPHana-SAPHanaTopology-suppress-systemctl-output.patch
Patch5: bz2043021-3-SAPHana-SAPHanaTopology-fix-unit-test-issue.patch
Patch1: bz2026727-1-SAPHana-remove-HANA_CALL_TIMEOUT-parameter.patch
Patch2: bz2026727-2-SAPHanaTopology-remove-HANA_CALL_TIMEOUT-parameter.patch
Patch3: bz2026273-1-SAPHana-SAPHanaTopology-add-systemd-support.patch
Patch4: bz2026273-2-SAPHana-SAPHanaTopology-suppress-systemctl-output.patch
Patch5: bz2026273-3-SAPHana-SAPHanaTopology-fix-unit-test-issue.patch
Patch6: bz2050205-SAPHana-SAPHanaTopology-fix-metadata-version.patch
BuildArch: noarch
@ -84,6 +85,7 @@ sed -i -e 's/\("provider_company": \)"SUSE"/\1"Red Hat"/g' %{saphana_prefix}-%{s
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
if [ ! -f configure ]; then
@ -140,16 +142,22 @@ rm -rf %{buildroot}
%exclude /usr/src
%changelog
* Thu Jan 20 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.154.0-3.3
* Thu Feb 3 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.154.0-7
- SAPHana/SAPHanaTopology: follow OCF standard for version and OCF
version in metadata
Resolves: rhbz#2050205
* Tue Feb 1 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.154.0-6
- SAPHana/SAPHanaTopology: add systemd support
Resolves: rhbz#2043021
Resolves: rhbz#2026273
* Tue Nov 30 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.154.0-3.1
* Tue Nov 30 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.154.0-4
- SAPHana/SAPHanaTopology: remove HANA_CALL_TIMEOUT parameter from
metadata
Resolves: rhbz#2027456
Resolves: rhbz#2026727
* Thu Jul 22 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.154.0-3
- SAPHana: use actual_mode from global.ini and fallback to mode when