diff --git a/.gitignore b/.gitignore index 2a441e4..d8edfff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -/*.tar.gz -/*.src.rpm -/.build-*.log -/*/ +/* +!/*.patch diff --git a/bz1991855-nfsserver-add-nfsconvert.patch b/bz1991855-nfsserver-add-nfsconvert.patch index e955c1a..1c64045 100644 --- a/bz1991855-nfsserver-add-nfsconvert.patch +++ b/bz1991855-nfsserver-add-nfsconvert.patch @@ -23,7 +23,7 @@ index f7277bf04e..ec30a3bb00 100644 +tools/nfsconvert tools/ocf-tester tools/send_arp - tools/tickle_tcp + tools/storage_mon diff --git a/configure.ac b/configure.ac index c125df98f6..058c0f1da7 100644 --- a/configure.ac @@ -79,9 +79,9 @@ index 83ff43651d..1309223b48 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -31,6 +31,7 @@ sbin_PROGRAMS = - sbin_PROGRAMS = sbin_SCRIPTS = ocf-tester - halib_PROGRAMS = findif + halib_PROGRAMS = findif \ + storage_mon +halib_SCRIPTS = man8_MANS = ocf-tester.8 diff --git a/ha-cloud-support-aws.patch b/ha-cloud-support-aws.patch index d858d5a..fbda111 100644 --- a/ha-cloud-support-aws.patch +++ b/ha-cloud-support-aws.patch @@ -6,7 +6,7 @@ diff --color -uNr a/heartbeat/awseip b/heartbeat/awseip # Defaults # -OCF_RESKEY_awscli_default="/usr/bin/aws" -+OCF_RESKEY_awscli_default="/usr/lib/fence-agents/support/aws/bin/aws" ++OCF_RESKEY_awscli_default="/usr/lib/fence-agents/support/awscli/bin/aws" OCF_RESKEY_profile_default="default" OCF_RESKEY_api_delay_default="3" @@ -18,7 +18,7 @@ diff --color -uNr a/heartbeat/awsvip b/heartbeat/awsvip # Defaults # -OCF_RESKEY_awscli_default="/usr/bin/aws" -+OCF_RESKEY_awscli_default="/usr/lib/fence-agents/support/aws/bin/aws" ++OCF_RESKEY_awscli_default="/usr/lib/fence-agents/support/awscli/bin/aws" OCF_RESKEY_profile_default="default" OCF_RESKEY_api_delay_default="3" @@ -30,7 +30,7 @@ diff --color -uNr a/heartbeat/aws-vpc-move-ip b/heartbeat/aws-vpc-move-ip # Defaults -OCF_RESKEY_awscli_default="/usr/bin/aws" -+OCF_RESKEY_awscli_default="/usr/lib/fence-agents/support/aws/bin/aws" ++OCF_RESKEY_awscli_default="/usr/lib/fence-agents/support/awscli/bin/aws" OCF_RESKEY_profile_default="default" OCF_RESKEY_region_default="" OCF_RESKEY_ip_default="" @@ -42,7 +42,7 @@ diff --color -uNr a/heartbeat/aws-vpc-route53.in b/heartbeat/aws-vpc-route53.in # Defaults -OCF_RESKEY_awscli_default="/usr/bin/aws" -+OCF_RESKEY_awscli_default="/usr/lib/fence-agents/support/aws/bin/aws" ++OCF_RESKEY_awscli_default="/usr/lib/fence-agents/support/awscli/bin/aws" OCF_RESKEY_profile_default="default" OCF_RESKEY_hostedzoneid_default="" OCF_RESKEY_fullname_default="" diff --git a/resource-agents.spec b/resource-agents.spec index d7d81e5..74db750 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -20,7 +20,7 @@ # %global upstream_prefix ClusterLabs-resource-agents -%global upstream_version e76b7d3a +%global upstream_version 55a4e2c9 # Whether this platform defaults to using systemd as an init system # (needs to be evaluated prior to BuildRequires being enumerated and @@ -44,8 +44,8 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts -Version: 4.8.0 -Release: 13%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Version: 4.9.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 @@ -173,13 +173,13 @@ exit 1 %setup -q -n %{upstream_prefix}-%{upstream_version} %patch0 -p1 -F1 %patch1 -p1 -%patch2 -p1 -F1 +%patch2 -p1 %patch3 -p1 # bundled ha-cloud-support libs %patch500 -p1 %patch501 -p1 -%patch502 -p1 -F2 +%patch502 -p1 chmod 755 heartbeat/nova-compute-wait chmod 755 heartbeat/NovaEvacuate @@ -219,10 +219,10 @@ export CFLAGS %endif %{conf_opt_fatal} \ %if %{defined _unitdir} - --with-systemdsystemunitdir=%{_unitdir} \ + SYSTEMD_UNIT_DIR=%{_unitdir} \ %endif %if %{defined _tmpfilesdir} - --with-systemdtmpfilesdir=%{_tmpfilesdir} \ + SYSTEMD_TMPFILES_DIR=%{_tmpfilesdir} \ --with-rsctmpdir=/run/resource-agents \ %endif --with-pkg-name=%{name} \ @@ -350,6 +350,8 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %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/dovecot +%exclude %{_usr}/lib/ocf/resource.d/heartbeat/dummypy %exclude %{_usr}/lib/ocf/resource.d/heartbeat/eDir88 %exclude %{_usr}/lib/ocf/resource.d/heartbeat/fio %exclude %{_usr}/lib/ocf/resource.d/heartbeat/ids @@ -364,12 +366,15 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %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/mdraid %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/nvmet-* %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/openstack-virtual-ip %exclude %{_usr}/lib/ocf/resource.d/heartbeat/ovsmonitor %exclude %{_usr}/lib/ocf/resource.d/heartbeat/pgagent %exclude %{_usr}/lib/ocf/resource.d/heartbeat/pingd @@ -380,6 +385,7 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %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/smb-share %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 @@ -413,6 +419,8 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %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_dovecot.7.gz +%exclude %{_mandir}/man7/ocf_heartbeat_dummypy.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 @@ -426,12 +434,15 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %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_mdraid.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_nvmet-*.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_openstack-virtual-ip.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 @@ -442,6 +453,7 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %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_smb-share.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 @@ -492,6 +504,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog +* Mon Sep 6 2021 Oyvind Albrigtsen - 4.9.0-1 +- Rebase to resource-agents 4.9.0 upstream release. + + Resolves: rhbz#1995918 + * Thu Aug 26 2021 Oyvind Albrigtsen - 4.8.0-13 - nfsnotify: fix default value for "notify_args" @@ -503,7 +520,6 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents - nfsserver: fix nfs-convert issue Resolves: rhbz#1997548, rhbz#1997576, rhbz#1991855 - * Mon Aug 16 2021 Oyvind Albrigtsen - 4.8.0-11 - Filesystem: force_unmount: remove "Default value" text from metadata diff --git a/sources b/sources index faa5ac4..b3c8caa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ClusterLabs-resource-agents-e76b7d3a.tar.gz) = 218ab0dee7f07c2ae5646a0ea3231c33bd573de4f1b041ebed560074c256b21cf33836fe50f3a18eb1ec11c2f9a4515da1066d2e4932f59cea5b9b8af892a6a6 +SHA512 (ClusterLabs-resource-agents-55a4e2c9.tar.gz) = 0b8dbf466cc4be3e165e4fb3b6a3ce93a6b49a7f4a7dc27916bfe3ec0b5de1e9df5c114d255608fb6ba1ca945ba49a4626e95cd28d6852e2e09d099d6edcb00b