Hello community, here is the log from the commit of package resource-agents.12233 for openSUSE:Leap:15.1:Update checked in at 2020-04-05 16:46:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.1:Update/resource-agents.12233 (Old) and /work/SRC/openSUSE:Leap:15.1:Update/.resource-agents.12233.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "resource-agents.12233" Sun Apr 5 16:46:52 2020 rev:1 rq:790287 version:4.3.0184.6ee15eb2 Changes: -------- New Changes file: --- /dev/null 2020-04-01 01:12:57.297512941 +0200 +++ /work/SRC/openSUSE:Leap:15.1:Update/.resource-agents.12233.new.3248/resource-agents.changes 2020-04-05 16:46:53.440922277 +0200 @@ -0,0 +1,2191 @@ +------------------------------------------------------------------- +Fri Mar 13 11:58:51 UTC 2020 - Peter Varkoly <[email protected]> + +- Request to add "gcp-vpc-move-route" resource agent to SLE12 and SLE15 + (bsc#1161898) Add patch: + 0007-Request-to-add-gcp-vpc-move-route.patch + +------------------------------------------------------------------- +Wed Nov 13 15:42:04 UTC 2019 - Peter Varkoly <[email protected]> + +- Netcat doesn't handle multiple connections, causing issues with + pacemaker. Netcat doesn't allow to restrict which clients can + initiate connections (bsc#1150046) +- Included the following patches: + * 0001-azure-lb-Set-socat-to-default-on-SUSE-distributions.patch + +------------------------------------------------------------------- +Mon Oct 28 13:45:46 UTC 2019 - Peter Varkoly <[email protected]> + +- Update to version 4.3.0184.6ee15eb2: + * Add missed requirement + * Apache resource agent is not working when I set statusurl value (bsc#1138281) + Use the function get_release_id to detect the OS. The parameter LOAD_STATUS_MODULE must be quoted. + * gcp-pd-move: add parameter stackdriver_logging (#1412) + * aws-vpc-route53: Improvements and fixes (#1409) + (bsc#1154465) Pickup latest changes for aws-vpc-route53 + * Adapt azure-lb Resource Agent to support socat usage too + * redis: consider redis-cli features to choose optimal password passing method and warning filtering workaround (#1403) + * LVM-activate: move pvscan --cache to validate + * fix master_is_active() erroneously reporting there is master when there is no fixes #1399 + * "WARNING: You are recommended to activate one LV at a time or use exclusive activation mode." is annoying. + (bsc#1151833) +- removed patches which was already applied upstream: + 0001-LVM-Default-partial_activation-to-true-in-SLE-HAE.patch + 0007-CTDB-support-Samba-4.9.patch +- adapted patch: + 0004-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch + Remove sensless change in not used spec template file. + +------------------------------------------------------------------- +Tue Jul 09 11:54:37 UTC 2019 - [email protected] + +- Update to version 4.3.018.a7fb5035: + (bsc#1140874) Include the latest aws-vpc-route53 bug fixes and + improvements from upstream. + * aws-vpc-route53: Removed absolute path for awk command. + Tuning on dig timeout on r53_monitor function + Changes and improvements to r53_start r53_stop _update_record + and r53_monitor functions. + Add --cli-connect-timeout 10 option to AWS CLI. + Replace ec2metada with curl to fetch the IP address directlyi + from EC2 metadata. + +------------------------------------------------------------------- +Fri Jun 14 17:46:34 UTC 2019 - David Disseldorp <[email protected]> + +- Fix CTDB resource agent for Samba 4.9.0 and later (bsc#1137130) + * 0007-CTDB-support-Samba-4.9.patch + +------------------------------------------------------------------- +Fri Jun 14 15:36:02 UTC 2019 - [email protected] + +- Update to version 4.2.0+git157.40de8382: + * azure-events: change message log level for the non action messages (bsc#1137038, bsc#1137231) + * Remove unneeded podman exec --help call + * Simplify podman_monitor() + * Avoid double call to podman inspect in podman_simple_status() + * dhcpd: keep SELinux context + * vsftpd: fix missing $ on exit code detected by CI + * ocf_is_true: add True to regexp + * Low: Filesystem: Fix missing mount point due to corrupted mount list + * Low: Filesystem: Fix a problem umount is not executed in the event of a disk failure + * pgsql: enhance checks in pgsql_real_start to prevent incorrect status gets + * Set fdisk command options on Linux or BSD + * Adds a virtio- prefix to check disk's availability + * Use fdisk to physically check disks' availability + * Monitor: check cinder volume locally without using the API + * Bad variable name to export (sh syntax) + * Use strict sh features (no bash regex) + * Cinder: Manages a local cache and calls the API to get openstack_id + * Medium: pgsql: Set initial score for primary and hot standby in the probe. + * Volume re-attaching, v3 API, get hostname from corosync + +------------------------------------------------------------------- +Tue Jun 04 15:03:21 UTC 2019 - [email protected] + +- Update to version 4.2.0+git122.571ed619: + * Fix implicit bytes conversion that breaks py3. Reduces the amount of errors messages using default value on crm_attribute (bsc#1137038, bsc#1137231) + * galera: Allow empty password for "check_passwd" parameter + * Squid: dont run pgrep -P without PID + +------------------------------------------------------------------- +Wed May 22 07:33:35 UTC 2019 - [email protected] + +- Update to version 4.2.0+git116.b6c0f9fb: + * galera: Log message when changing content of grastate.dat file + * Use _default variables for all OCF_RESKEYs. + * Use _default variable for binary path. + * Drop unused LSB_STATUS_STOPPED variable. + * Add resource agent for dovecot. + * Fixes parameter meta-data + * Fails docker RA gracefully when command not found Fails gracefully when daemon not running + * CTDB: fix version string with vendor trailer comparison (bsc#1133337) + +------------------------------------------------------------------- +Fri May 03 11:34:56 UTC 2019 - [email protected] + +- Update to version 4.2.0+git104.25f2052b: + * Low: LVM: Change of return code when start fails. + * galera: Ignore safe_to_bootstrap in grastate.dat in some cases + * aws-vpc-move-ip: Linting adjustment (bsc#1133962) + * aws-vpc-move-ip: Moving shared part outside if (bsc#1133962) + * aws-vpc-move-ip: More robust approach of getting MAC address (bsc#1133962) + * ethmonitor: fix is_interface() regression + * aws-vpc-move-ip: Requested fix to avoid using AWS API (bsc#1133962) + * aws-vpc-move-ip: Fixing indentation (bsc#1133962) + * aws-vpc-move-ip: Fix for VM having multiple network interfaces (bsc#1133962) + * add network namespace support to IPaddr2 + * [rabbitmq] Stop redirecting all output to /dev/null in set_policy + * Support build and install on RHEL 6 (#1308) + * gcp-vpc-move-route/gcp-vpc-move-vip: fix Python 3 encoding issue + * IPsrcaddr: make proto optional to fix regression when used without NetworkManager + * LVM-activate: align dmsetup report command to standard + * LVM-activate: return OCF_NOT_RUNNING on initial probe (bsc#1114855) + * ethmonitor: check if interface exists by link + * Squid: fix pid file issue due to new Squid version saving the PID of the parent process instead of the listener child process + * Restrict strncpy by size of target, not of source. Fixes gcc error/warning + * CTDB: add ctdb_max_open_files parameter + * LVM-activate: only check locking_type when LVM < v2.03 + * redis: Filter warning from stderr when calling 'redis-cli -a' + * LVM-activate: fix indentation + +- Remove 0007-LVM-activate-return-OCF_NOT_RUNNING-on-initial-probe.patch + * This patch was integrated upstream and is not needed as an extra patch. + +------------------------------------------------------------------- +Tue Apr 02 10:50:22 UTC 2019 - [email protected] + +- LVM-activate returns the correct value on initial probe (bsc#1114855) + * 0007-LVM-activate-return-OCF_NOT_RUNNING-on-initial-probe.patch + +------------------------------------------------------------------- +Mon Feb 18 13:06:33 UTC 2019 - [email protected] + +- Update to version 4.2.0+git63.0f7987fb: + * clvm: support exclusive mode + * Revert " Added support for multiple slaves to pgsql." + * azure-lb: remove reference to status from usage + * configure: add Python library detection + * Added support for multiple slaves to pgsql. + * LVM-activate: make vgname not uniqe + * LVM-activate: fix dmsetup check + * LVM-activate: fix bashism [[ + * Route: make family parameter optional + * LVM-activate: dont fail initial probe + * docker: Fix issues with stop operation + * rabbitmq-cluster: always use quiet flag for eval calls + * aws-vpc-move-ip: multiple VPC routing tables in routing_tables parameter - included comment in metadata section (bsc#1125138) + * aws-vpc-move-ip: multiple VPC routing tables in routing_tables parameter - adjusting sleep time (bsc#1125138) + * aws-vpc-move-ip: new feature: include support for multiple routing tables (bsc#1125138) + +------------------------------------------------------------------- +Thu Dec 06 08:49:05 UTC 2018 - [email protected] + +- Update to version 4.2.0+git33.69a622fd: + * rabbitmq-cluster: better ensure node attributes are removed + * Do not log at debug log level when HA_debug is unset + * Enable --query flag in DescribeRouteTable API (#1269) + * Moved more Code to the Legacy section and cleaned the Legacy code as we already know that we are on pre-1.0 Version + * Add lxc-stop Timeout + * Remove Parameter and replace with Version Check + * lxc: Add Support for lxc-stop + * rabbitmq-cluster: fix regression in rmq_stop + * rabbitmq-cluster: debug log detailed output when mnesia query fails + * SAPDatabase: Improved the documentation about HANA usage + +- Remove 0001-Revert-Add-additional-info-to-SAPDatabase-RA.patch + +------------------------------------------------------------------- +Thu Nov 01 12:45:58 UTC 2018 - [email protected] + +- Update to version 4.2.0+git8.7c750bab: + * heartbeat/{docker,podman,rkt}: nicer treatment of "reuse" parameter + * Maint: fix several typos discovered with "make spellcheck" + * Fix demote example log line. + +------------------------------------------------------------------- +Mon Oct 22 08:13:35 UTC 2018 - [email protected] + +- Included the missing azure-events RA needed for maintenance on the + Azure Public Cloud. (bsc#1112334) +- Included the ocy.py library used by the azure-events RA (bsc#1112334) + +- Update to version 4.1.1+git24.9b664917: + * apache: fix return value for silent_status + * ZFS: cleanup different indentations + * Fix spelling error in gcp-vpc-move-ip/route ++++ 1994 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Leap:15.1:Update/.resource-agents.12233.new.3248/resource-agents.changes New: ---- 0001-azure-lb-Set-socat-to-default-on-SUSE-distributions.patch 0002-nfsserver-fix-path-to-sm-notify.patch 0003-ldirectord-don-t-create-subsys-lock.patch 0004-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch 0006-Revert-ocf_log-use-same-log-format-as-pacemaker.patch 0007-Request-to-add-gcp-vpc-move-route.patch _service _servicedata monitoring-plugins-metadata.tar.bz2 resource-agents-4.3.0184.6ee15eb2.tar.xz resource-agents.changes resource-agents.conf resource-agents.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ resource-agents.spec ++++++ # # spec file for package resource-agents # # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # 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 https://bugs.opensuse.org/ # Name: resource-agents Version: 4.3.0184.6ee15eb2 Release: 0 Summary: HA Reusable Cluster Resource Scripts License: GPL-2.0-only AND LGPL-2.1-or-later AND GPL-3.0-or-later Group: Productivity/Clustering/HA Url: http://linux-ha.org/ Source: resource-agents-%{version}.tar.xz Source1: resource-agents.conf Source2: monitoring-plugins-metadata.tar.bz2 # PATCH-FIX-OPENSUSE: fix path to sm-notify Patch2: 0002-nfsserver-fix-path-to-sm-notify.patch # PATCH-FIX-OPENSUSE: ldirectord: don't create subsys lock Patch3: 0003-ldirectord-don-t-create-subsys-lock.patch # PATCH-FIX-OPENSUSE: Revert moving binaries to /usr/libexec Patch4: 0004-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch # PATCH-FIX-OPENSUSE: Revert ocf_log: use same log format at pacemaker Patch6: 0006-Revert-ocf_log-use-same-log-format-as-pacemaker.patch # PATCH-UPSTREAM Patch7: 0001-azure-lb-Set-socat-to-default-on-SUSE-distributions.patch # PATCH-FIX-OPENSUSE: Patch8: 0007-Request-to-add-gcp-vpc-move-route.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook_4 BuildRequires: libglue-devel BuildRequires: libxslt BuildRequires: pkgconfig BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(glib-2.0) Requires: /usr/bin/logger # ocf-distro Requires: lsb-release Obsoletes: heartbeat-resources Provides: %{name}-devel = %{version} Provides: heartbeat-resources # Merging the aws-vpc-move-ip package as the upstream RA will be adopted. Provides: aws-vpc-move-ip = 0.2.20171113 Obsoletes: aws-vpc-move-ip <= 0.2.20171113 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description A set of scripts to interface with several services to operate in a High Availability environment for both Pacemaker and rgmanager service managers. %package -n ldirectord Summary: A Monitoring Daemon for Maintaining High Availability Resources License: GPL-2.0-only AND LGPL-2.1-or-later Group: Productivity/Clustering/HA Requires: %{name} Requires: ipvsadm Requires: logrotate Requires: perl-IO-Socket-INET6 Requires: perl-MailTools Requires: perl-Net-SSLeay Requires: perl-Socket6 Requires: perl-libwww-perl Obsoletes: heartbeat-ldirectord Provides: heartbeat-ldirectord %{?systemd_requires} %description -n ldirectord ldirectord is a stand-alone daemon for monitoring the services on real servers. Currently, HTTP, HTTPS, and FTP services are supported. ldirectord works with the heartbeat code (http://www.linux-ha.org/). See `ldirectord -h` and linux-ha/doc/ldirectord for more information. %package -n monitoring-plugins-metadata Summary: Metadata for Monitoring plugins License: LGPL-2.1-or-later AND GPL-2.0-or-later Group: Productivity/Clustering/HA Requires: monitoring-plugins-fping Requires: monitoring-plugins-http Requires: monitoring-plugins-ldap Requires: monitoring-plugins-mysql Requires: monitoring-plugins-pgsql Requires: monitoring-plugins-tcp Requires: resource-agents Provides: nagios-plugins-metadata BuildArch: noarch %description -n monitoring-plugins-metadata XML files containing metadata which facilitates using nagios plugins as resource agents. These files were produced from help pages of individual nagios plugins. %prep %setup -q %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p0 %build autoreconf -fvi # because quilt push changed the permissions of sg_persist. # chmod 775 heartbeat/sg_persist %configure \ --docdir=%{_defaultdocdir}/%{name} \ --with-ras-set=linux-ha \ --enable-fatal-warnings=no \ --enable-libnet=no \ --with-systemdsystemunitdir=%{_unitdir} \ \ --with-pkg-name=%{name} \ --with-rsctmpdir=%{_rundir}/%{name} make %{?_smp_mflags} %install %make_install mkdir -p %{buildroot}%{_sysconfdir}/ha.d/resource.d ln -s service %{buildroot}/%{_sbindir}/rcldirectord # Dont package static libs find %{buildroot} -type f -name "*.la" -delete -print # Unset execute permissions from things that shouln't have it find %{buildroot} "(" -name "ocf-*" -o -name "*.dtd" ")" -type f -exec chmod a-x "{}" "+" chmod 0755 %{buildroot}%{_sbindir}/ocf-tester chmod 0755 %{buildroot}%{_sbindir}/ocft mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d install -m 644 %{SOURCE1} %{buildroot}%{_prefix}/lib/tmpfiles.d ( cd %{buildroot}/%{_libdir}/heartbeat for f in ocf-returncodes ocf-shellfuncs do ln -s %{_libexecdir}/ocf/lib/heartbeat/$f done ) # install nagios plugins XML metadata tar -xjf %{SOURCE2} mkdir -p %{buildroot}%{_datadir}/nagios/plugins-metadata for file in $(find plugins-metadata -type f); do install -m 644 $file %{buildroot}%{_datadir}/nagios/plugins-metadata done # Create a symlink for backward compat of suse:aws-vpc-move-ip ( mkdir -p %{buildroot}%{_libexecdir}/ocf/resource.d/suse cd %{buildroot}%{_libexecdir}/ocf/resource.d/suse ln -s %{_libexecdir}/ocf/resource.d/heartbeat/aws-vpc-move-ip aws-vpc-move-ip ) %post %service_add_post resource-agents-deps.target %tmpfiles_create %_tmpfilesdir/resource-agents.conf %preun %service_del_preun resource-agents-deps.target %postun %service_del_postun resource-agents-deps.target %pre %service_add_pre resource-agents-deps.target %preun -n ldirectord %service_del_preun ldirectord.service %postun -n ldirectord %service_del_postun ldirectord.service %post -n ldirectord %service_add_post ldirectord.service %pre -n ldirectord %service_add_pre ldirectord.service %files %defattr(-,root,root) %dir %{_prefix}/lib/ocf %dir %{_prefix}/lib/ocf/resource.d %dir %{_prefix}/lib/ocf/lib %dir %{_prefix}/lib/tmpfiles.d %_tmpfilesdir/resource-agents.conf %dir %{_datadir}/%{name} %{_datadir}/%{name}/*.rng %dir %{_datadir}/%{name}/ocft %dir %{_datadir}/%{name}/ocft/configs %config(noreplace) %{_datadir}/%{name}/ocft/configs/* %{_datadir}/%{name}/ocft/caselib %{_datadir}/%{name}/ocft/README %{_datadir}/%{name}/ocft/README.zh_CN %{_datadir}/%{name}/ocft/helpers.sh %{_datadir}/%{name}/ocft/runocft %{_datadir}/%{name}/ocft/runocft.prereq %{_libexecdir}/ocf/resource.d/suse %{_libexecdir}/ocf/resource.d/heartbeat %{_libexecdir}/ocf/lib/heartbeat %{_sbindir}/ocf-tester %{_sbindir}/ocft %{_sbindir}/sfex_init %{_sbindir}/sfex_stat %{_includedir}/heartbeat %{_unitdir}/resource-agents-deps.target %ghost %dir %attr (1755, root, root) %{_rundir}/resource-agents %doc AUTHORS %license COPYING %license COPYING.LGPL %license COPYING.GPLv3 %doc %{_datadir}/%{name}/ra-api-1.dtd %{_mandir}/man7/*.7* %{_mandir}/man8/ocf-tester.8* %{_mandir}/man8/sfex_init.8* %doc doc/README.webapps # For compatability with pre-existing agents %dir %{_sysconfdir}/ha.d %config %{_sysconfdir}/ha.d/shellfuncs %dir %{_libdir}/heartbeat %{_libdir}/heartbeat/ocf-shellfuncs %{_libdir}/heartbeat/ocf-returncodes %{_libdir}/heartbeat/send_arp %{_libdir}/heartbeat/send_ua %{_libdir}/heartbeat/sfex_daemon %{_libdir}/heartbeat/findif %{_libdir}/heartbeat/tickle_tcp %files -n ldirectord %defattr(-,root,root) %doc ldirectord/ldirectord.cf %{_mandir}/man8/ldirectord.8* %dir %{_sysconfdir}/ha.d/resource.d %{_sbindir}/ldirectord %{_sbindir}/rcldirectord %{_unitdir}/ldirectord.service %exclude %{_sysconfdir}/init.d/ldirectord %{_sysconfdir}/ha.d/resource.d/ldirectord %config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord %files -n monitoring-plugins-metadata %defattr(-,root,root) %dir %{_datadir}/nagios %dir %{_datadir}/nagios/plugins-metadata %attr(0644,root,root) %{_datadir}/nagios/plugins-metadata/* %changelog ++++++ 0001-azure-lb-Set-socat-to-default-on-SUSE-distributions.patch ++++++ >From f733014fd6eefc3888a2433ecf0bff17d391db54 Mon Sep 17 00:00:00 2001 From: Peter Varkoly <[email protected]> Date: Wed, 13 Nov 2019 14:51:51 +0100 Subject: [PATCH 1/1] azure-lb Set socat to default on SUSE distributions. --- heartbeat/azure-lb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/heartbeat/azure-lb b/heartbeat/azure-lb index 5ee76747..05c13451 100755 --- a/heartbeat/azure-lb +++ b/heartbeat/azure-lb @@ -18,6 +18,11 @@ # Defaults OCF_RESKEY_nc_default="/usr/bin/nc" +case "$( get_release_id )" in + *SUSE) + OCF_RESKEY_nc_default="/usr/bin/socat" + ;; +esac OCF_RESKEY_port_default="61000" : ${OCF_RESKEY_nc=${OCF_RESKEY_nc_default}} @@ -54,8 +59,7 @@ Resource agent to answer Azure Load Balancer health probe requests <parameter name="nc"> <longdesc lang="en"> The full path of the used binary. This can be nc or socat path. -The default is /usr/bin/nc. -If you need /usr/bin/socat this parameter should be set. +The default is /usr/bin/nc and /usr/bin/socat for SUSE distributions. </longdesc> <shortdesc lang="en">Full path of the used binary (nc or socat are allowed)</shortdesc> <content type="string" default="${OCF_RESKEY_nc_default}"/> -- 2.16.4 ++++++ 0002-nfsserver-fix-path-to-sm-notify.patch ++++++ >From 0fe969d6b2a7269aba16f676558927f76fc38dd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <[email protected]> Date: Wed, 1 Feb 2017 14:52:01 +0100 Subject: [PATCH 2/5] nfsserver: fix path to sm-notify --- heartbeat/nfsserver | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/heartbeat/nfsserver b/heartbeat/nfsserver index bac5bbbb..6e32d37a 100755 --- a/heartbeat/nfsserver +++ b/heartbeat/nfsserver @@ -27,7 +27,7 @@ do done DEFAULT_NOTIFY_CMD=`which sm-notify` -DEFAULT_NOTIFY_CMD=${DEFAULT_NOTIFY_CMD:-"/sbin/sm-notify"} +DEFAULT_NOTIFY_CMD=${DEFAULT_NOTIFY_CMD:-"/usr/sbin/sm-notify"} DEFAULT_NOTIFY_FOREGROUND="false" DEFAULT_RPCPIPEFS_DIR="/var/lib/nfs/rpc_pipefs" EXEC_MODE=0 -- 2.13.2 ++++++ 0003-ldirectord-don-t-create-subsys-lock.patch ++++++ >From e8d2bf94bccd1a4884b519af203f3741ad2121a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <[email protected]> Date: Wed, 1 Feb 2017 14:52:50 +0100 Subject: [PATCH 3/5] ldirectord: don't create subsys lock --- ldirectord/init.d/ldirectord.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/ldirectord/init.d/ldirectord.in b/ldirectord/init.d/ldirectord.in index 9d8083e4..f7ab5525 100755 --- a/ldirectord/init.d/ldirectord.in +++ b/ldirectord/init.d/ldirectord.in @@ -60,11 +60,9 @@ action() { case "$1" in start) action "Starting ldirectord" $DAEMON start - touch /var/lock/subsys/ldirectord ;; stop) action "Stopping ldirectord" $DAEMON stop - rm -f /var/lock/subsys/ldirectord ;; restart) action "Restarting ldirectord" $DAEMON restart -- 2.13.2 ++++++ 0004-Revert-Low-build-Move-binaries-in-usr-lib-heartbeat-.patch ++++++ >From 1072e6d34fd9edb374385d7430471257335984c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <[email protected]> Date: Thu, 18 May 2017 00:18:14 +0200 Subject: [PATCH 4/5] Revert "Low: build: Move binaries in /usr/lib/heartbeat to /usr/libexec/heartbeat to avoid multi-lib inconsistencies" This reverts commit 1e79b7831d9daf9cbfa852f0d6f909d2f7ec4a2a. --- heartbeat/Makefile.am | 2 +- heartbeat/ocf-directories.in | 2 +- resource-agents.spec.in | 2 +- tools/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/heartbeat/Makefile.am b/heartbeat/Makefile.am index fd3ca454..4950c6e5 100644 --- a/heartbeat/Makefile.am +++ b/heartbeat/Makefile.am @@ -25,7 +25,7 @@ EXTRA_DIST = $(ocf_SCRIPTS) $(ocfcommon_DATA) \ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/linux-ha -halibdir = $(libexecdir)/heartbeat +halibdir = $(libdir)/heartbeat ocfdir = $(OCF_RA_DIR_PREFIX)/heartbeat diff --git a/heartbeat/ocf-directories.in b/heartbeat/ocf-directories.in index d8df035e..f734162e 100644 --- a/heartbeat/ocf-directories.in +++ b/heartbeat/ocf-directories.in @@ -11,7 +11,7 @@ exec_prefix=@exec_prefix@ : ${HA_RSCTMP:=@HA_RSCTMPDIR@} : ${HA_RSCTMP_OLD:=@HA_VARRUNDIR@/heartbeat/rsctmp} : ${HA_FIFO:=@localstatedir@/lib/heartbeat/fifo} -: ${HA_BIN:=@libexecdir@/heartbeat} +: ${HA_BIN:=@libdir@/heartbeat} : ${HA_SBIN_DIR:=@sbindir@} : ${HA_DATEFMT:="%b %d %T "} : ${HA_DEBUGLOG:=/dev/null} diff --git a/tools/Makefile.am b/tools/Makefile.am index 1186967c..71292bf3 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -23,7 +23,7 @@ SUBDIRS = ocft AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -halibdir = $(libexecdir)/heartbeat +halibdir = $(libdir)/heartbeat EXTRA_DIST = ocf-tester.8 sfex_init.8 -- 2.13.2 ++++++ 0006-Revert-ocf_log-use-same-log-format-as-pacemaker.patch ++++++ >From fa566f94cf5a491ce5f06e9b9edcc5d39edd05f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <[email protected]> Date: Thu, 18 May 2017 00:11:10 +0200 Subject: [PATCH 6/6] Revert "ocf_log: use same log format as pacemaker" This reverts commit 75816393878bf063a8c3404b5c747868024e1097. --- heartbeat/ocf-directories.in | 2 +- heartbeat/ocf-shellfuncs.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/heartbeat/ocf-directories.in b/heartbeat/ocf-directories.in index f734162e..7246e088 100644 --- a/heartbeat/ocf-directories.in +++ b/heartbeat/ocf-directories.in @@ -13,7 +13,7 @@ exec_prefix=@exec_prefix@ : ${HA_FIFO:=@localstatedir@/lib/heartbeat/fifo} : ${HA_BIN:=@libdir@/heartbeat} : ${HA_SBIN_DIR:=@sbindir@} -: ${HA_DATEFMT:="%b %d %T "} +: ${HA_DATEFMT:="%Y/%m/%d_%T "} : ${HA_DEBUGLOG:=/dev/null} : ${HA_RESOURCEDIR:=$HA_DIR/resource.d} : ${HA_DOCDIR:=@datadir@/doc/heartbeat} diff --git a/heartbeat/ocf-shellfuncs.in b/heartbeat/ocf-shellfuncs.in index 4a74e201..a0716bb6 100644 --- a/heartbeat/ocf-shellfuncs.in +++ b/heartbeat/ocf-shellfuncs.in @@ -231,7 +231,7 @@ __ha_log() { [ -n "$HA_LOGFILE" ] then : appending to $HA_LOGFILE - echo `hadate`" $HA_LOGTAG: ${*}" >> $HA_LOGFILE + echo "$HA_LOGTAG: "`hadate`"${*}" >> $HA_LOGFILE fi if [ -z "$HA_LOGFACILITY" -a -z "$HA_LOGFILE" ] && ! [ "$ignore_stderr" = "true" ] -- 2.12.2 ++++++ 0007-Request-to-add-gcp-vpc-move-route.patch ++++++ --- configure.ac-orig 2020-03-03 10:46:46.352038934 +0100 +++ configure.ac 2020-03-03 10:47:23.932583111 +0100 @@ -534,25 +534,12 @@ AM_CONDITIONAL(BUILD_AZURE_EVENTS, test $BUILD_AZURE_EVENTS -eq 1) BUILD_GCP_PD_MOVE=1 -if test -z "$PYTHON" || test "x${HAVE_PYMOD_GOOGLEAPICLIENT}" != xyes || test $BUILD_OCF_PY -eq 0; then - BUILD_GCP_PD_MOVE=0 - AC_MSG_WARN("Not building gcp-pd-move") -fi AM_CONDITIONAL(BUILD_GCP_PD_MOVE, test $BUILD_GCP_PD_MOVE -eq 1) BUILD_GCP_VPC_MOVE_ROUTE=1 -if test -z "$PYTHON" || test "x${HAVE_PYMOD_GOOGLEAPICLIENT}" != xyes || \ - test "x${HAVE_PYMOD_PYROUTE2}" != xyes || test $BUILD_OCF_PY -eq 0; then - BUILD_GCP_VPC_MOVE_ROUTE=0 - AC_MSG_WARN("Not building gcp-vpc-move-route") -fi AM_CONDITIONAL(BUILD_GCP_VPC_MOVE_ROUTE, test $BUILD_GCP_VPC_MOVE_ROUTE -eq 1) BUILD_GCP_VPC_MOVE_VIP=1 -if test -z "$PYTHON" || test "x${HAVE_PYMOD_GOOGLEAPICLIENT}" != xyes || test $BUILD_OCF_PY -eq 0; then - BUILD_GCP_VPC_MOVE_VIP=0 - AC_MSG_WARN("Not building gcp-vpc-move-vip") -fi AM_CONDITIONAL(BUILD_GCP_VPC_MOVE_VIP, test $BUILD_GCP_VPC_MOVE_VIP -eq 1) AC_PATH_PROGS(ROUTE, route) ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="url">git://github.com/varkoly/resource-agents.git</param> <param name="scm">git</param> <param name="exclude">.git</param> <param name="filename">resource-agents</param> <param name="versionformat">4.3.0@TAG_OFFSET@.%h</param> <param name="revision">fix-apache-rs-on-suse</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> <param name="file">resource-agents*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"> <param name="basename">resource-agents</param> </service> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/resource-agents.git</param> <param name="changesrevision">25cd5b1c9f6b4cbc3a471e83ebe88366c14212c8</param> </service> <service name="tar_scm"> <param name="url">git://github.com/varkoly/resource-agents.git</param> <param name="changesrevision">6ee15eb2d7eb53f3f2c6c78ce87f075ef3c067c9</param></service></servicedata>++++++ resource-agents.conf ++++++ d /var/run/resource-agents 1755 root root
