Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/resource-agents.git#781aaa1f8884a16a0b8a71043f1bb70c73f2bb60
This commit is contained in:
DistroBaker
parent
677db36268
commit
c4ef4bef6f
|
|
@ -1,39 +0,0 @@
|
|||
From b792a143fc90468f8911243a5ea77c0c424bd624 Mon Sep 17 00:00:00 2001
|
||||
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||
Date: Tue, 2 Mar 2021 11:17:36 +0100
|
||||
Subject: [PATCH] Filesystem: change force_unmount default to safe for RHEL9+
|
||||
|
||||
---
|
||||
heartbeat/Filesystem | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
|
||||
index 90e22dae6..48d58e1d5 100755
|
||||
--- a/heartbeat/Filesystem
|
||||
+++ b/heartbeat/Filesystem
|
||||
@@ -68,21 +68,21 @@ OCF_RESKEY_fstype_default=""
|
||||
OCF_RESKEY_options_default=""
|
||||
OCF_RESKEY_statusfile_prefix_default="${DFLT_STATUSDIR}"
|
||||
OCF_RESKEY_run_fsck_default="auto"
|
||||
-
|
||||
OCF_RESKEY_fast_stop_default="no"
|
||||
+OCF_RESKEY_force_clones_default="false"
|
||||
+OCF_RESKEY_force_unmount_default="true"
|
||||
|
||||
-# yes for RHEL/CentOS versions less than 9, otherwise no
|
||||
+# RHEL9+ specific defaults
|
||||
if is_redhat_based; then
|
||||
get_os_ver
|
||||
ocf_version_cmp "$VER" "9.0" 2>/dev/null
|
||||
|
||||
if [ "$?" -eq 0 ]; then
|
||||
OCF_RESKEY_fast_stop_default="yes"
|
||||
+ OCF_RESKEY_force_unmount_default="safe"
|
||||
fi
|
||||
fi
|
||||
|
||||
-OCF_RESKEY_force_clones_default="false"
|
||||
-OCF_RESKEY_force_unmount_default="true"
|
||||
|
||||
: ${OCF_RESKEY_device=${OCF_RESKEY_device_default}}
|
||||
: ${OCF_RESKEY_directory=${OCF_RESKEY_directory_default}}
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
From e0cfb07e0d8470b22ea825224ee31f2f987c39d7 Mon Sep 17 00:00:00 2001
|
||||
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||
Date: Mon, 15 Mar 2021 10:41:10 +0100
|
||||
Subject: [PATCH] Filesystem: fix force_unmount default to safe for RHEL9+
|
||||
issue introduced in b792a143fc90468f8911243a5ea77c0c424bd624
|
||||
|
||||
---
|
||||
heartbeat/Filesystem | 14 +++++++++-----
|
||||
1 file changed, 9 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
|
||||
index 48d58e1d5..9d8a786f9 100755
|
||||
--- a/heartbeat/Filesystem
|
||||
+++ b/heartbeat/Filesystem
|
||||
@@ -72,15 +72,19 @@ OCF_RESKEY_fast_stop_default="no"
|
||||
OCF_RESKEY_force_clones_default="false"
|
||||
OCF_RESKEY_force_unmount_default="true"
|
||||
|
||||
-# RHEL9+ specific defaults
|
||||
+# RHEL specific defaults
|
||||
if is_redhat_based; then
|
||||
get_os_ver
|
||||
ocf_version_cmp "$VER" "9.0" 2>/dev/null
|
||||
|
||||
- if [ "$?" -eq 0 ]; then
|
||||
- OCF_RESKEY_fast_stop_default="yes"
|
||||
- OCF_RESKEY_force_unmount_default="safe"
|
||||
- fi
|
||||
+ case "$?" in
|
||||
+ # RHEL >= 9
|
||||
+ 1|2)
|
||||
+ OCF_RESKEY_force_unmount_default="safe";;
|
||||
+ # RHEL < 9 and fallback if ocf_version_cmp() fails
|
||||
+ *)
|
||||
+ OCF_RESKEY_fast_stop_default="yes";;
|
||||
+ esac
|
||||
fi
|
||||
|
||||
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
diff --color -uNr a/heartbeat/awseip b/heartbeat/awseip
|
||||
--- a/heartbeat/awseip 2020-12-03 14:31:17.000000000 +0100
|
||||
+++ b/heartbeat/awseip 2021-02-15 16:47:36.624610378 +0100
|
||||
@@ -43,7 +43,7 @@
|
||||
#
|
||||
# Defaults
|
||||
#
|
||||
-OCF_RESKEY_awscli_default="/usr/bin/aws"
|
||||
+OCF_RESKEY_awscli_default="/usr/lib/fence-agents/support/aws/bin/aws"
|
||||
OCF_RESKEY_profile_default="default"
|
||||
OCF_RESKEY_api_delay_default="3"
|
||||
|
||||
diff --color -uNr a/heartbeat/awsvip b/heartbeat/awsvip
|
||||
--- a/heartbeat/awsvip 2020-12-03 14:31:17.000000000 +0100
|
||||
+++ b/heartbeat/awsvip 2021-02-15 16:47:48.960632484 +0100
|
||||
@@ -42,7 +42,7 @@
|
||||
#
|
||||
# Defaults
|
||||
#
|
||||
-OCF_RESKEY_awscli_default="/usr/bin/aws"
|
||||
+OCF_RESKEY_awscli_default="/usr/lib/fence-agents/support/aws/bin/aws"
|
||||
OCF_RESKEY_profile_default="default"
|
||||
OCF_RESKEY_api_delay_default="3"
|
||||
|
||||
diff --color -uNr a/heartbeat/aws-vpc-move-ip b/heartbeat/aws-vpc-move-ip
|
||||
--- a/heartbeat/aws-vpc-move-ip 2020-12-03 14:31:17.000000000 +0100
|
||||
+++ b/heartbeat/aws-vpc-move-ip 2021-02-15 16:47:55.484644118 +0100
|
||||
@@ -35,7 +35,7 @@
|
||||
. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
|
||||
|
||||
# Defaults
|
||||
-OCF_RESKEY_awscli_default="/usr/bin/aws"
|
||||
+OCF_RESKEY_awscli_default="/usr/lib/fence-agents/support/aws/bin/aws"
|
||||
OCF_RESKEY_profile_default="default"
|
||||
OCF_RESKEY_region_default=""
|
||||
OCF_RESKEY_ip_default=""
|
||||
diff --color -uNr a/heartbeat/aws-vpc-route53.in b/heartbeat/aws-vpc-route53.in
|
||||
--- a/heartbeat/aws-vpc-route53.in 2020-12-03 14:31:17.000000000 +0100
|
||||
+++ b/heartbeat/aws-vpc-route53.in 2021-02-15 16:47:59.808651828 +0100
|
||||
@@ -45,7 +45,7 @@
|
||||
. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
|
||||
|
||||
# Defaults
|
||||
-OCF_RESKEY_awscli_default="/usr/bin/aws"
|
||||
+OCF_RESKEY_awscli_default="/usr/lib/fence-agents/support/aws/bin/aws"
|
||||
OCF_RESKEY_profile_default="default"
|
||||
OCF_RESKEY_hostedzoneid_default=""
|
||||
OCF_RESKEY_fullname_default=""
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
#
|
||||
|
||||
%global upstream_prefix ClusterLabs-resource-agents
|
||||
%global upstream_version ef4ec184
|
||||
%global upstream_version e76b7d3a
|
||||
|
||||
# Whether this platform defaults to using systemd as an init system
|
||||
# (needs to be evaluated prior to BuildRequires being enumerated and
|
||||
|
|
@ -38,27 +38,31 @@
|
|||
} || %{?__transaction_systemd_inhibit:1}%{!?__transaction_systemd_inhibit:0}%{nil \
|
||||
} || %(test -f /usr/lib/os-release; test $? -ne 0; echo $?))
|
||||
|
||||
# SSLeay (required by ldirectord)
|
||||
%if 0%{?suse_version}
|
||||
%global SSLeay perl-Net_SSLeay
|
||||
%else
|
||||
%global SSLeay perl-Net-SSLeay
|
||||
%endif
|
||||
|
||||
# determine the ras-set to process based on configure invokation
|
||||
%bcond_with rgmanager
|
||||
%bcond_without linuxha
|
||||
|
||||
Name: resource-agents
|
||||
Summary: Open Source HA Reusable Cluster Resource Scripts
|
||||
Version: 4.7.0
|
||||
Release: 7%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
||||
Version: 4.8.0
|
||||
Release: 1%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
||||
License: GPLv2+ and LGPLv2+
|
||||
URL: https://github.com/ClusterLabs/resource-agents
|
||||
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
|
||||
Patch0: ha-cloud-support-aws.patch
|
||||
Patch1: bz1843578-Filesystem-1-force_unmount-safe.patch
|
||||
Patch2: bz1843578-Filesystem-2-fix-force_unmount-safe.patch
|
||||
|
||||
Obsoletes: heartbeat-resources <= %{version}
|
||||
Provides: heartbeat-resources = %{version}
|
||||
|
||||
# Build dependencies
|
||||
BuildRequires: make
|
||||
BuildRequires: automake autoconf pkgconfig gcc
|
||||
BuildRequires: perl
|
||||
BuildRequires: libxslt glib2-devel
|
||||
BuildRequires: systemd
|
||||
BuildRequires: which
|
||||
|
|
@ -70,7 +74,12 @@ BuildRequires: python-devel
|
|||
%endif
|
||||
|
||||
%ifarch x86_64
|
||||
BuildRequires: ha-cloud-support
|
||||
%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7
|
||||
BuildRequires: python3-google-api-client python3-pyroute2
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: python3-google-api-python-client
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
|
||||
|
|
@ -133,6 +142,42 @@ A set of scripts to interface with several services to operate in a
|
|||
High Availability environment for both Pacemaker and rgmanager
|
||||
service managers.
|
||||
|
||||
%if %{with linuxha}
|
||||
%package -n ldirectord
|
||||
License: GPLv2+
|
||||
Summary: A Monitoring Daemon for Maintaining High Availability Resources
|
||||
%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
|
||||
%else
|
||||
%endif
|
||||
Obsoletes: heartbeat-ldirectord <= %{version}
|
||||
Provides: heartbeat-ldirectord = %{version}
|
||||
%if 0%{?fedora} > 18 || 0%{?centos} > 6 || 0%{?rhel} > 6
|
||||
BuildRequires: perl-podlators
|
||||
%endif
|
||||
Requires: %{SSLeay} perl-libwww-perl perl-MailTools
|
||||
Requires: ipvsadm logrotate
|
||||
%if 0%{?fedora}
|
||||
Requires: perl-Net-IMAP-Simple-SSL perl-IO-Socket-INET6
|
||||
Requires(post): /sbin/chkconfig
|
||||
Requires(preun):/sbin/chkconfig
|
||||
%endif
|
||||
%if %{systemd_native}
|
||||
BuildRequires: systemd
|
||||
%endif
|
||||
%{?systemd_requires}
|
||||
|
||||
%description -n ldirectord
|
||||
The Linux Director Daemon (ldirectord) was written by Jacob Rief.
|
||||
<jacob.rief@tiscover.com>
|
||||
|
||||
ldirectord is a stand alone daemon for monitoring the services on real
|
||||
servers. Currently, HTTP, HTTPS, and FTP services are supported.
|
||||
ldirectord is simple to install and works with Pacemaker
|
||||
(http://clusterlabs.org/).
|
||||
|
||||
See 'ldirectord -h' and linux-ha/doc/ldirectord for more information.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%if 0%{?suse_version} == 0 && 0%{?fedora} == 0 && 0%{?centos} == 0 && 0%{?rhel} == 0
|
||||
%{error:Unable to determine the distribution/version. This is generally caused by missing /etc/rpm/macros.dist. Please install the correct build packages or define the required macros manually.}
|
||||
|
|
@ -168,9 +213,6 @@ export CFLAGS
|
|||
%configure \
|
||||
%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version}
|
||||
PYTHON="%{__python3}" \
|
||||
%endif
|
||||
%ifarch x86_64
|
||||
PYTHONPATH="%{_usr}/lib/fence-agents/support/google" \
|
||||
%endif
|
||||
%{conf_opt_fatal} \
|
||||
%if %{defined _unitdir}
|
||||
|
|
@ -199,6 +241,16 @@ make install DESTDIR=%{buildroot}
|
|||
# remove docs (there is only one and they should come from doc sections in files)
|
||||
rm -rf %{buildroot}/usr/share/doc/resource-agents
|
||||
|
||||
%if %{with linuxha}
|
||||
%if 0%{?suse_version}
|
||||
test -d %{buildroot}/sbin || mkdir %{buildroot}/sbin
|
||||
(
|
||||
cd %{buildroot}/sbin
|
||||
ln -sf /%{_sysconfdir}/init.d/ldirectord rcldirectord
|
||||
) || true
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%files
|
||||
%doc AUTHORS COPYING COPYING.GPLv3 COPYING.LGPL ChangeLog
|
||||
%if %{with linuxha}
|
||||
|
|
@ -221,6 +273,10 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
|
|||
%{_usr}/lib/ocf/lib/heartbeat
|
||||
|
||||
%{_usr}/lib/ocf/resource.d/heartbeat
|
||||
%if %{with rgmanager}
|
||||
%{_usr}/lib/ocf/resource.d/redhat
|
||||
%endif
|
||||
|
||||
%{_datadir}/pkgconfig/%{name}.pc
|
||||
|
||||
%if %{defined _unitdir}
|
||||
|
|
@ -240,7 +296,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
|
|||
%exclude %{_datadir}/%{name}/ocft/runocft
|
||||
%exclude %{_datadir}/%{name}/ocft/runocft.prereq
|
||||
|
||||
%{_sbindir}/ocf-tester
|
||||
%{_sbindir}/ocft
|
||||
%if 0%{?suse_version}
|
||||
%{_sbindir}/sfex_*
|
||||
%endif
|
||||
|
||||
%{_includedir}/heartbeat
|
||||
|
||||
|
|
@ -251,174 +311,80 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
|
|||
%endif
|
||||
|
||||
%{_mandir}/man7/*.7*
|
||||
###
|
||||
# Unsupported
|
||||
###
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/AoEtarget
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/AudibleAlarm
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/ClusterMon
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/EvmsSCC
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/Evmsd
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/ICP
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/IPaddr
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/LVM
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/LinuxSCSI
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/ManageRAID
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/ManageVE
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/Pure-FTPd
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/Raid1
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/ServeRAID
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/SphinxSearchDaemon
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/Stateful
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/SysInfo
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/VIPArip
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/WAS
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/WAS6
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/WinPopup
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/Xen
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/ZFS
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/anything
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/asterisk
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/clvm
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/dnsupdate
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/docker*
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/eDir88
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/fio
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/ids
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/iface-bridge
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/ipsec
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/iscsi
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/jboss
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/jira
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/kamailio
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/ldirectord
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/lxc
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/lxd-info
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/machine-info
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/mariadb
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/minio
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/mpathpersist
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/mysql-proxy
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/openstack-cinder-volume
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/openstack-floating-ip
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/openstack-info
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/ovsmonitor
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/pgagent
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/pingd
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/pound
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/proftpd
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/rkt
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/rsyslog
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/scsi2reservation
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/sfex
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/sg_persist
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/syslog-ng
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/varnish
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/vmware
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/vsftpd
|
||||
%exclude %{_usr}/lib/ocf/resource.d/heartbeat/zabbixserver
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_AoEtarget.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_AudibleAlarm.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_ClusterMon.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_EvmsSCC.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_Evmsd.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_ICP.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_IPaddr.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_LVM.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_LinuxSCSI.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_ManageRAID.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_ManageVE.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_Pure-FTPd.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_Raid1.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_ServeRAID.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_SphinxSearchDaemon.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_Stateful.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_SysInfo.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_VIPArip.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_WAS.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_WAS6.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_WinPopup.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_Xen.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_ZFS.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_anything.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_asterisk.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_clvm.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_dnsupdate.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_docker*.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_eDir88.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_fio.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_ids.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_iface-bridge.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_ipsec.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_iscsi.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_jboss.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_jira.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_kamailio.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_lxc.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_lxd-info.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_machine-info.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_mariadb.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_minio.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_mpathpersist.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_mysql-proxy.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_openstack-cinder-volume.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_openstack-floating-ip.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_openstack-info.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_ovsmonitor.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_pgagent.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_pingd.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_pound.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_proftpd.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_rkt.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_rsyslog.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_scsi2reservation.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_sfex.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_sg_persist.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_syslog-ng.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_varnish.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_vmware.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_vsftpd.7.gz
|
||||
%exclude %{_mandir}/man7/ocf_heartbeat_zabbixserver.7.gz
|
||||
|
||||
###
|
||||
# Other excluded files.
|
||||
###
|
||||
# This tool has to be updated for the new pacemaker lrmd.
|
||||
%exclude %{_sbindir}/ocf-tester
|
||||
%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 %{_unitdir}/ldirectord.service
|
||||
%exclude /etc/logrotate.d/ldirectord
|
||||
%exclude /usr/sbin/ldirectord
|
||||
%exclude %{_mandir}/man8/ldirectord.8.gz
|
||||
%{_mandir}/man8/ocf-tester.8*
|
||||
%if 0%{?suse_version}
|
||||
%{_mandir}/man8/sfex_init.8*
|
||||
%endif
|
||||
|
||||
# For compatability with pre-existing agents
|
||||
%dir %{_sysconfdir}/ha.d
|
||||
%{_sysconfdir}/ha.d/shellfuncs
|
||||
|
||||
%{_libexecdir}/heartbeat
|
||||
|
||||
%if %{with rgmanager}
|
||||
%post -n resource-agents
|
||||
ccs_update_schema > /dev/null 2>&1 ||:
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version}
|
||||
%preun -n ldirectord
|
||||
%stop_on_removal ldirectord
|
||||
%postun -n ldirectord
|
||||
%insserv_cleanup
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora}
|
||||
%preun -n ldirectord
|
||||
%if %{defined _unitdir}
|
||||
%systemd_preun ldirectord.service
|
||||
%else
|
||||
/sbin/chkconfig --del ldirectord
|
||||
%endif
|
||||
%postun -n ldirectord
|
||||
/sbin/ldconfig
|
||||
%if %{defined _unitdir}
|
||||
%systemd_postun_with_restart ldirectord.service
|
||||
%endif
|
||||
%post -n ldirectord
|
||||
%if %{defined _unitdir}
|
||||
%systemd_post ldirectord.service
|
||||
%else
|
||||
/sbin/chkconfig --add ldirectord
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{with linuxha}
|
||||
%files -n ldirectord
|
||||
%{_sbindir}/ldirectord
|
||||
%doc ldirectord/ldirectord.cf COPYING
|
||||
%{_mandir}/man8/ldirectord.8*
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord
|
||||
%dir %{_sysconfdir}/ha.d
|
||||
%dir %{_sysconfdir}/ha.d/resource.d
|
||||
%{_sysconfdir}/ha.d/resource.d/ldirectord
|
||||
%if %{defined _unitdir}
|
||||
%{_unitdir}/ldirectord.service
|
||||
%exclude %{_sysconfdir}/init.d/ldirectord
|
||||
%exclude %{_sysconfdir}/rc.d/init.d/ldirectord
|
||||
%else
|
||||
%{_sysconfdir}/init.d/ldirectord
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
/sbin/rcldirectord
|
||||
%endif
|
||||
%if 0%{?fedora}
|
||||
%{_usr}/lib/ocf/resource.d/heartbeat/ldirectord
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Mar 16 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.7.0-7
|
||||
- Filesystem: change force_unmount default to safe for RHEL9+
|
||||
* Thu Mar 25 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.8.0-1
|
||||
- Rebase to resource-agents 4.8.0 upstream release.
|
||||
|
||||
Resolves: rhbz#1843578
|
||||
|
||||
* Wed Mar 3 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.7.0-5
|
||||
- Exclude unsupported agents
|
||||
|
||||
* Wed Feb 24 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.7.0-4
|
||||
- remove ldirectord subpackage
|
||||
|
||||
Resolves: rhbz#1932218
|
||||
|
||||
* Tue Feb 16 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.7.0-3
|
||||
* Fri Feb 12 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.7.0-2
|
||||
- add BuildRequires for google lib
|
||||
- use HA cloud support supplied awscli
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.0-1.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (ClusterLabs-resource-agents-ef4ec184.tar.gz) = 625e64244148a15eb9a127a28eae331dae041addeefc85bf778d851e567235ae3a5ce8839a6f05578cf212899cc63079d3c6d9a7b69643787210d6f02b2be576
|
||||
SHA512 (ClusterLabs-resource-agents-e76b7d3a.tar.gz) = 218ab0dee7f07c2ae5646a0ea3231c33bd573de4f1b041ebed560074c256b21cf33836fe50f3a18eb1ec11c2f9a4515da1066d2e4932f59cea5b9b8af892a6a6
|
||||
|
|
|
|||
Loading…
Reference in New Issue