import resource-agents-sap-4.1.1-31.el8_6.1

This commit is contained in:
CentOS Sources 2022-08-02 03:11:47 -04:00 committed by Stepan Oksanichenko
parent 12fc3ab50c
commit aa2155f4a9
2 changed files with 49 additions and 1 deletions

View File

@ -0,0 +1,41 @@
From d6b954890b496fcdd8a76d7c2dd44a36fa0ad42c Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Thu, 7 Oct 2021 11:10:16 +0200
Subject: [PATCH 1/3] all agents: specify agent and OCF versions corrently in
metadata
---
heartbeat/SAPDatabase | 4 ++--
heartbeat/SAPInstance | 4 ++--
133 files changed, 169 insertions(+), 169 deletions(-)
diff --git a/heartbeat/SAPDatabase b/heartbeat/SAPDatabase
index 3486303f10..563a6f3469 100755
--- a/heartbeat/SAPDatabase
+++ b/heartbeat/SAPDatabase
@@ -109,8 +109,8 @@ meta_data() {
cat <<END
<?xml version="1.0"?>
<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
-<resource-agent name="SAPDatabase">
-<version>2.14</version>
+<resource-agent name="SAPDatabase" version="2.14">
+<version>1.0</version>
<longdesc lang="en">
Resource script for SAP databases. It manages a SAP database of any type as an HA resource.
diff --git a/heartbeat/SAPInstance b/heartbeat/SAPInstance
index f8bcbc05b8..016f59aff2 100755
--- a/heartbeat/SAPInstance
+++ b/heartbeat/SAPInstance
@@ -110,8 +110,8 @@ sapinstance_meta_data() {
cat <<END
<?xml version="1.0"?>
<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
-<resource-agent name="SAPInstance">
-<version>2.14</version>
+<resource-agent name="SAPInstance" version="2.14">
+<version>1.0</version>
<longdesc lang="en">
Usually a SAP system consists of one database and at least one or more SAP instances (sometimes called application servers). One SAP Instance is defined by having exactly one instance profile. The instance profiles can usually be found in the directory /sapmnt/SID/profile. Each instance must be configured as it's own resource in the cluster configuration.

View File

@ -28,7 +28,7 @@
Name: resource-agents-sap
Summary: SAP cluster resource agents
Version: 4.1.1
Release: 31%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
Release: 31%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.1
License: GPLv2+
URL: https://github.com/ClusterLabs/resource-agents
%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@ -44,6 +44,7 @@ Patch2: bz1751949-3-SAPInstance-metadata-improvements.patch
Patch3: bz1817439-use-safe-temp-file-location.patch
Patch4: bz2024140-SAPInstance-1-add-systemd-support.patch
Patch5: bz2024140-SAPInstance-2-fix-systemd-issue.patch
Patch6: bz2098171-SAPDatabase-SAPInstance-set-correct-agent-ocf-version.patch
BuildArch: noarch
@ -72,6 +73,7 @@ SAP instances to be managed in a cluster environment.
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
if [ ! -f configure ]; then
@ -136,6 +138,11 @@ rm -rf %{buildroot}
%exclude /usr/src
%changelog
* Fri Jun 17 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.1.1-31.1
- SAPDatabase/SAPInstance: set correct agent and OCF version in metadata
Resolves: rhbz#2098171
* Thu Nov 18 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.1.1-31
- SAPInstance: add systemd support