From 673790a90922cf02a0b5544eb62a9cb1dab099f6e0b1b264f67767149d855aa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 30 Aug 2024 15:34:53 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main sapstartsrv-resource-agents revision b6efe09b95cc236b2073c0100901da78 --- .gitattributes | 23 ++++ _service | 19 +++ ...agents-0.9.4+git.1702393371.1758e33.tar.gz | 3 + sapstartsrv-resource-agents.changes | 90 ++++++++++++++ sapstartsrv-resource-agents.spec | 110 ++++++++++++++++++ 5 files changed, 245 insertions(+) create mode 100644 .gitattributes create mode 100644 _service create mode 100644 sapstartsrv-resource-agents-0.9.4+git.1702393371.1758e33.tar.gz create mode 100644 sapstartsrv-resource-agents.changes create mode 100644 sapstartsrv-resource-agents.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/_service b/_service new file mode 100644 index 0000000..5f5d005 --- /dev/null +++ b/_service @@ -0,0 +1,19 @@ + + + https://github.com/SUSE/SAPStartSrv-resourceAgent.git + git + .git + sapstartsrv-resource-agents + 0.9.4+git.%ct.%h + 1758e33df5c6a79b3b47dde45f49b8c57b6d1675 + + + + *.tar + gz + + + + sapstartsrv-resource-agents + + diff --git a/sapstartsrv-resource-agents-0.9.4+git.1702393371.1758e33.tar.gz b/sapstartsrv-resource-agents-0.9.4+git.1702393371.1758e33.tar.gz new file mode 100644 index 0000000..ff2da36 --- /dev/null +++ b/sapstartsrv-resource-agents-0.9.4+git.1702393371.1758e33.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:156994a6ad451aaf0fcdc2b9dd38e43e8e089b486774c46e394d37868ea2bfd6 +size 34614 diff --git a/sapstartsrv-resource-agents.changes b/sapstartsrv-resource-agents.changes new file mode 100644 index 0000000..00fbd09 --- /dev/null +++ b/sapstartsrv-resource-agents.changes @@ -0,0 +1,90 @@ +------------------------------------------------------------------- +Wed Aug 28 09:56:31 UTC 2024 - abriel@suse.com + +- add SLE16 support + +------------------------------------------------------------------- +Mon Dec 11 12:08:44 UTC 2023 - abriel@suse.com + +- Version bump to 0.9.4 + * fix error in exception handling of sapstartsrv status function + (bsc#1217276) + +------------------------------------------------------------------- +Fri Aug 4 17:41:44 UTC 2023 - abriel@suse.com + +- Version bump to 0.9.3 + * adapt fix for monitor/probe operation to detect a running + sapstartsrv process to run with python3-psutil version 5.2.2 + or higher + (bsc#1210790) + +------------------------------------------------------------------- +Wed May 24 16:41:49 UTC 2023 - abriel@suse.com + +- Version bump to 0.9.2 + * prevent systemd service race between sapping and sappong during + system boot + (bsc#1207138) + * fix a problem of monitor/probe operation to detect a running + sapstartsrv process + (bsc#1210790) + +- add python3-psutil as package requirement and as build + requirement in case of testing + needed for bsc#1210790 + (jsc#PED-4418, jsc#PED-4499) + +------------------------------------------------------------------- +Wed Sep 14 09:37:25 UTC 2022 - abriel@suse.com + +- Version bump to 0.9.1 +- man page updates based on customer feedback on conferences +- remove 'BuildRequire python3-mock' as this is no longer needed + for the tests + +------------------------------------------------------------------- +Fri Feb 25 11:18:02 UTC 2022 - abriel@suse.com + +- Add systemd support for the resource agent to interact with the + new SAP unit files for sapstartsrv. + As the new version of the SAP Startup Framework will use systemd + unit files to control the sapstartsrv process instead of the + previous used SysV init script, we need to adapt the handling of + sapstartsrv inside the resource agents to support both ways. + (bsc#1189529) +- prevent false posivite with pgrep in function '_get_status' + (bsc#1193568) + +------------------------------------------------------------------- +Thu Apr 22 13:05:47 UTC 2021 - abriel@suse.com + +- remove deprecated option "syslog" from the sapping.service and + sappong.service files. + (bsc#1185152) + +------------------------------------------------------------------- +Wed Mar 31 09:43:09 UTC 2021 - abriel@suse.com + +- prevent sapping.service from running a second time after a + corosync start/restart + (bsc#1183969) + +------------------------------------------------------------------- +Fri Mar 5 08:54:12 UTC 2021 - Xabier Arbulu + +- Fix the spec file to follow properly the SLE submission policies + +------------------------------------------------------------------- +Fri Dec 4 15:22:52 UTC 2020 - Fabian Herschel + +- Add sapservices-move script + +------------------------------------------------------------------- +Wed Sep 16 09:33:32 UTC 2020 - Xabier Arbulu + +- Simplified Cluster FS architecture for S/4HANA and NetWeaver + It controls the instance specific sapstartsrv process which + provides the API to start, stop and check a SAP instance. + (jsc#ECO-3341, jsc#SLE-16935, jsc#SLE-17440) +- Include python version to the resource agent diff --git a/sapstartsrv-resource-agents.spec b/sapstartsrv-resource-agents.spec new file mode 100644 index 0000000..4ac1a7a --- /dev/null +++ b/sapstartsrv-resource-agents.spec @@ -0,0 +1,110 @@ +# +# spec file for package sapstartsrv-resource-agents +# +# Copyright (c) 2020-2024 SUSE LLC. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ + +%if 0%{?suse_version} < 1600 +%bcond_with test +%else +%bcond_without test +%endif + +Name: sapstartsrv-resource-agents +License: GPL-2.0 +Group: Productivity/Clustering/HA +Summary: Resource agent for SAP instance specific sapstartsrv service +Version: 0.9.4+git.1702393371.1758e33 +Release: 0 +URL: https://github.com/SUSE/SAPStartSrv-resourceAgent +Source0: %{name}-%{version}.tar.gz +BuildArch: noarch +BuildRequires: resource-agents +Requires: resource-agents +Requires: pacemaker > 1.1.1 +Requires: python3 +Requires: python3-psutil +%if %{with test} +BuildRequires: python3-pytest +BuildRequires: python3-psutil +%endif + +%define raname SAPStartSrv +%define srvname sapservices-move +%define ocf_dir %{_prefix}/lib/ocf + +%description +This is a resource agent for the instance specific SAP start framework. +It controls the instance specific sapstartsrv process which provides the +API to start, stop and check an SAP instance. + +Authors: +-------- + Fabian Herschel + Lars Pinne + Xabier Arbulu + +%prep +%setup -q + +%build +gzip man/* + +%install +install -D -m 0755 ra/%{raname}.in %{buildroot}%{ocf_dir}/resource.d/suse/%{raname} +install -d %{buildroot}%{_mandir}/man7 +install -d %{buildroot}%{_mandir}/man8 +install -m 0444 man/*.7.gz %{buildroot}%{_mandir}/man7 +install -m 0444 man/*.8.gz %{buildroot}%{_mandir}/man8 +install -D -m 0644 sbin/%{srvname}.in %{buildroot}%{_sbindir}/%{srvname} +install -d %{buildroot}%{_unitdir} +install -m 0644 service/* %{buildroot}%{_unitdir} +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcsapping +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcsappong + +sed -i 's+@PYTHON@+%{_bindir}/python3+' %{buildroot}%{ocf_dir}/resource.d/suse/%{raname} +sed -i 's+@PYTHON@+%{_bindir}/python3+' %{buildroot}%{_sbindir}/%{srvname} + +%if %{with test} +%check +pytest tests +%endif + +%pre +%service_add_pre sapping.service sappong.service + +%post +%service_add_post sapping.service sappong.service + +%preun +%service_del_preun sapping.service sappong.service + +%postun +%service_del_postun sapping.service sappong.service + +%files +%defattr(-,root,root) +%license LICENSE +%doc README.md +%{_mandir}/man7/*.7.gz +%{_mandir}/man8/*.8.gz +%dir %{ocf_dir} +%dir %{ocf_dir}/resource.d +%dir %{ocf_dir}/resource.d/suse +%defattr(755,root,root,-) +%{ocf_dir}/resource.d/suse/%{raname} +%{_sbindir}/* +%defattr(644,root,root,-) +%{_unitdir}/* + +%changelog