Hello community,
here is the log from the commit of package resource-agents for openSUSE:Factory
checked in at 2018-12-11 15:42:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/resource-agents (Old)
and /work/SRC/openSUSE:Factory/.resource-agents.new.19453 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "resource-agents"
Tue Dec 11 15:42:36 2018 rev:90 rq:655552 version:4.2.0+git33.69a622fd
Changes:
--------
--- /work/SRC/openSUSE:Factory/resource-agents/resource-agents.changes
2018-11-06 13:54:36.132235026 +0100
+++
/work/SRC/openSUSE:Factory/.resource-agents.new.19453/resource-agents.changes
2018-12-11 15:42:45.874540565 +0100
@@ -1,0 +2,25 @@
+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.
+
+-------------------------------------------------------------------
Old:
----
0001-Revert-Add-additional-info-to-SAPDatabase-RA.patch
resource-agents-4.1.9+git24.9b664917.tar.xz
New:
----
resource-agents-4.2.0+git33.69a622fd.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ resource-agents.spec ++++++
--- /var/tmp/diff_new_pack.y0lcVB/_old 2018-12-11 15:42:46.446539937 +0100
+++ /var/tmp/diff_new_pack.y0lcVB/_new 2018-12-11 15:42:46.450539933 +0100
@@ -12,12 +12,12 @@
# 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/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: resource-agents
-Version: 4.1.9+git24.9b664917
+Version: 4.2.0+git33.69a622fd
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
@@ -37,8 +37,6 @@
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-FIX-OPENSUSE: Revert: "Add additional info to SAPDatabase RA"
-Patch7: 0001-Revert-Add-additional-info-to-SAPDatabase-RA.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -112,7 +110,6 @@
%patch3 -p1
%patch4 -p1
%patch6 -p1
-%patch7 -p1
%build
autoreconf -fvi
++++++ _service ++++++
--- /var/tmp/diff_new_pack.y0lcVB/_old 2018-12-11 15:42:46.502539877 +0100
+++ /var/tmp/diff_new_pack.y0lcVB/_new 2018-12-11 15:42:46.506539872 +0100
@@ -4,7 +4,8 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="filename">resource-agents</param>
- <param name="versionformat">4.1.9+git@TAG_OFFSET@.%h</param>
+ <param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param>
+ <param name="versionrewrite-pattern">v(.*)</param>
<param name="revision">master</param>
<param name="changesgenerate">enable</param>
</service>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.y0lcVB/_old 2018-12-11 15:42:46.534539841 +0100
+++ /var/tmp/diff_new_pack.y0lcVB/_new 2018-12-11 15:42:46.534539841 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/ClusterLabs/resource-agents.git</param>
-<param name="changesrevision">9b664917864ee43a4c2c6ecd2145904e3218a6d9</param>
+<param name="changesrevision">8ed87936e9ad06318cc49ea767885a405dfde11e</param>
</service>
</servicedata>
\ No newline at end of file
++++++ resource-agents-4.1.9+git24.9b664917.tar.xz ->
resource-agents-4.2.0+git33.69a622fd.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/resource-agents-4.1.9+git24.9b664917/ChangeLog
new/resource-agents-4.2.0+git33.69a622fd/ChangeLog
--- old/resource-agents-4.1.9+git24.9b664917/ChangeLog 2018-10-19
15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/ChangeLog 2018-12-06
08:44:07.000000000 +0100
@@ -1,3 +1,12 @@
+* Wed Oct 24 2018 resource-agents contributors
+- stable release 4.2.0
+- apache: fix return value for silent_status
+- rabbitmq-cluster: fail monitor when node is in minority partition
+- ocf.py: only add s-suffix to timeout and interval
+- ZFS: check status without locks when possible
+- pgsql: fix to avoid failing on masters re-promote
+- azure-events: new RA
+
* Wed Oct 17 2018 resource-agents contributors
- release candidate 4.2.0 rc1
- CI: fixes for bash path, strncpy in GCC 8 and missing docbook-style-xsl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/resource-agents-4.1.9+git24.9b664917/Makefile.am
new/resource-agents-4.2.0+git33.69a622fd/Makefile.am
--- old/resource-agents-4.1.9+git24.9b664917/Makefile.am 2018-10-19
15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/Makefile.am 2018-12-06
08:44:07.000000000 +0100
@@ -174,5 +174,13 @@
$(MAKE) $(SPEC) $(TARFILES)
rpmbuild $(RPMBUILDOPTS) -ba $(SPEC)
+spellcheck: make/spellcheck-ignore
+if BUILD_LINUX_HA
+ $(MAKE) -C heartbeat $@
+endif
+if BUILD_RGMANAGER
+ : not implemented for RGManager-compat agents
+endif
+
clean-generic:
rm -rf $(SPEC) $(TARFILES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.1.9+git24.9b664917/doc/dev-guides/ra-dev-guide.asc
new/resource-agents-4.2.0+git33.69a622fd/doc/dev-guides/ra-dev-guide.asc
--- old/resource-agents-4.1.9+git24.9b664917/doc/dev-guides/ra-dev-guide.asc
2018-10-19 15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/doc/dev-guides/ra-dev-guide.asc
2018-12-06 08:44:07.000000000 +0100
@@ -874,7 +874,7 @@
while true; do
foobar_monitor
if [ $? -eq $OCF_RUNNING_MASTER ]; then
- ocf_log debug "Resource still awaiting promotion"
+ ocf_log debug "Resource still demoting"
sleep 1
else
ocf_log debug "Resource demoted"
@@ -1026,9 +1026,17 @@
With notifications, instances of clones (and of master/slave
resources, which are an extended kind of clones) can inform each other
-about their state. When notifications are enabled, any action on any
-instance of a clone carries a +pre+ and +post+ notification. Then, the
-cluster manager invokes the +notify+ operation on _all_ clone
+about their state. When notifications are enabled, certain actions on
+any instance of a clone carries a +pre+ and +post+ notification.
+
+List of actions that trigger notifications:
+
+* start
+* stop
+* promote
+* demote
+
+The cluster manager invokes the +notify+ operation on _all_ clone
instances. For +notify+ operations, additional environment variables
are passed into the resource agent during execution:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.1.9+git24.9b664917/heartbeat/Makefile.am
new/resource-agents-4.2.0+git33.69a622fd/heartbeat/Makefile.am
--- old/resource-agents-4.1.9+git24.9b664917/heartbeat/Makefile.am
2018-10-19 15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/heartbeat/Makefile.am
2018-12-06 08:44:07.000000000 +0100
@@ -200,3 +200,13 @@
%.check: %
OCF_ROOT=$(abs_srcdir) OCF_FUNCTIONS_DIR=$(abs_srcdir) ./$< meta-data |
xmllint --path $(abs_srcdir) --noout --relaxng $(abs_srcdir)/metadata.rng -
+
+do_spellcheck = printf '[%s]\n' "$(agent)"; \
+ OCF_ROOT=$(abs_srcdir) OCF_FUNCTIONS_DIR=$(abs_srcdir) \
+ ./$(agent) meta-data 2>/dev/null \
+ | xsltproc $(top_srcdir)/make/extract_text.xsl - \
+ | aspell pipe list -d en_US --ignore-case \
+ --home-dir=$(top_srcdir)/make -p spellcheck-ignore \
+ | sed -n 's|^&\([^:]*\):.*|\1|p';
+spellcheck:
+ @$(foreach agent,$(ocf_SCRIPTS), $(do_spellcheck))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.1.9+git24.9b664917/heartbeat/SAPDatabase
new/resource-agents-4.2.0+git33.69a622fd/heartbeat/SAPDatabase
--- old/resource-agents-4.1.9+git24.9b664917/heartbeat/SAPDatabase
2018-10-19 15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/heartbeat/SAPDatabase
2018-12-06 08:44:07.000000000 +0100
@@ -92,16 +92,17 @@
Patch Number: 90
or compile time after: Dec 17 2011
-A single HANA is managed as a primitive resource by the SAPDatabase RA.
Therefor the parameter MONITOR_SERVICES has to match the output service names
of the command "sapcontrol -nr \$InstNr -function GetProcessList".
-"\$InstNr" has to be replaced by the respective instance number.
+To exemplify the usage, for a HANA database with SID "TST" and instance number
"10", the resource configuration using crmsh syntax looks like:
-For an HANA database with SID "TST" and instance number "10", the resource
configuration looks like:
primitive rsc_SAPDatabase_TST_HDB10 ocf:heartbeat:SAPDatabase \\
params DBTYPE="HDB" SID="TST" \\
- MONITOR_SERVICES="hdbindexserver|hdbnameserver" \\
op start interval="0" timeout="3600" \\
op monitor interval="120" timeout="700" \\
op stop interval="0" timeout="600"
+
+Make sure to tune the operations timeout values accordingly with your chosen
Database and available infrastructure.
+
+Note that the same configuration can be achieved using any other CLI tool for
cluster configuration available, like pcs or cibadmin.
</longdesc>
<shortdesc lang="en">Manages a SAP database instance as an HA
resource.</shortdesc>
<parameters>
@@ -159,7 +160,16 @@
</parameter>
<parameter name="MONITOR_SERVICES" unique="0" required="0">
<longdesc lang="en">Defines which services are monitored by the SAPDatabase
resource agent. Service names must correspond with the output of the
'saphostctrl -function GetDatabaseStatus' command.
-The default value is derived from the database type DBTYPE. For example,
DBTYPE "ORA" sets MONITOR_SERVICES="Instance|Database|Listener".</longdesc>
+The default MONITOR_SERVICES value is derived from the database type DBTYPE.
For reference:
+
+- DBTYPE "ORA" sets MONITOR_SERVICES="Instance|Database|Listener";
+- DBTYPE "HDB" sets MONITOR_SERVICES="hdbindexserver|hdbnameserver";
+- DBTYPE "ADA" sets MONITOR_SERVICES="Database";
+- DBTYPE "DB6" sets MONITOR_SERVICES="{SID}|{db2sid}";
+- DBTYPE "SYB" sets MONITOR_SERVICES="Server".
+
+This parameter should be set ONLY if is needed to monitor different services
than the ones listed above.
+</longdesc>
<shortdesc lang="en">Database services to monitor</shortdesc>
<content type="string" default=""/>
</parameter>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.1.9+git24.9b664917/heartbeat/SAPInstance
new/resource-agents-4.2.0+git33.69a622fd/heartbeat/SAPInstance
--- old/resource-agents-4.1.9+git24.9b664917/heartbeat/SAPInstance
2018-10-19 15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/heartbeat/SAPInstance
2018-12-06 08:44:07.000000000 +0100
@@ -159,14 +159,14 @@
<content type="string"
default="disp+work|msg_server|enserver|enrepserver|jcontrol|jstart|enq_server|enq_replicator"/>
</parameter>
<parameter name="SHUTDOWN_METHOD" unique="0" required="0">
- <longdesc lang="en">Usual a SAP Instance is stopped by the command
'sapcontrol -nr InstanceNr -function Stop'. SHUTDOWN_METHOD=KILL means to kill
the SAP Instance using OS commands. SAP processes of the instance are
terminated with 'kill -9', shared memory is deleted with 'cleanipc' and the
'kill.sap' file will be deleted. That method is much faster than the gracefull
stop, but the instance does not have the chance to say goodbye to other
SAPinstances in the same system. USE AT YOUR OWN RISK !!</longdesc>
+ <longdesc lang="en">Usually a SAP Instance is stopped by the command
'sapcontrol -nr InstanceNr -function Stop'. SHUTDOWN_METHOD=KILL means to kill
the SAP Instance using OS commands. SAP processes of the instance are
terminated with 'kill -9', shared memory is deleted with 'cleanipc' and the
'kill.sap' file will be deleted. That method is much faster than the graceful
stop, but the instance does not have the chance to say goodbye to other
SAPinstances in the same system. USE AT YOUR OWN RISK !!</longdesc>
<shortdesc lang="en">Shutdown graceful or kill a SAP instance by terminating
the processes. (normal|KILL)</shortdesc>
<content type="string" default="normal"/>
</parameter>
<parameter name="ERS_InstanceName" unique="1" required="0">
<longdesc lang="en">Only used in a Master/Slave resource configuration:
The full qualified SAP enqueue replication instance name. e.g.
P01_ERS02_sapp01ers. Usually this is the name of the SAP instance profile.
-The enqueue replication instance must be installed, before you want to
configure a master-slave cluster recource.
+The enqueue replication instance must be installed, before you want to
configure a master-slave cluster resource.
The master-slave configuration in the cluster must use this properties:
clone_max = 2
@@ -209,7 +209,7 @@
<longdesc lang="en">Only used for ASCS/ERS SAP Netweaver installations
without implementing a master/slave resource to
allow the ASCS to 'find' the ERS running on another cluster node after a
resource failure. This parameter should be set
to true 'only' for the ERS instance for implementations following the SAP
NetWeaver 7.40 HA certification (NW-HA-CLU-740). This includes also
- systems for NetWeaver less than 7.40, if you like to impelemnt the
NW-HA-CLU-740 scenario.
+ systems for NetWeaver less than 7.40, if you like to implement the
NW-HA-CLU-740 scenario.
</longdesc>
<shortdesc lang="en">Mark SAPInstance as ERS instance</shortdesc>
<content type="boolean" default="false" />
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.1.9+git24.9b664917/heartbeat/SendArp
new/resource-agents-4.2.0+git33.69a622fd/heartbeat/SendArp
--- old/resource-agents-4.1.9+git24.9b664917/heartbeat/SendArp 2018-10-19
15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/heartbeat/SendArp 2018-12-06
08:44:07.000000000 +0100
@@ -79,7 +79,7 @@
This RA can be used _instead_ of the IPaddr2 or IPaddr RA to
send gratuitous ARP for an IP address on a given interface,
without adding the address to that interface. For example,
-if for some resaon you wanted to send gratuitous ARP for
+if for some reason you wanted to send gratuitous ARP for
addresses managed by IPaddr2 or IPaddr on an additional
interface.
</longdesc>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.1.9+git24.9b664917/heartbeat/Squid.in
new/resource-agents-4.2.0+git33.69a622fd/heartbeat/Squid.in
--- old/resource-agents-4.1.9+git24.9b664917/heartbeat/Squid.in 2018-10-19
15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/heartbeat/Squid.in 2018-12-06
08:44:07.000000000 +0100
@@ -140,13 +140,13 @@
<parameter name="debug_log" unique="0">
<longdesc lang="en">
-This is an optional and omittable parameter.
+This is an optional parameter.
This parameter specifies a destination file for debug logs
and works only if this RA run in debug mode. Refer to "debug_mode"
-about debug mode. If no value is given but it's requied, it's made by the
-following rules: "/var/log/" as a directory part, the basename of
-the configuration file given by "syslog_ng_conf" as a basename part,
-".log" as a suffix.
+about debug mode. If no value is given but is required, it's constructed
+according to the following rules: "/var/log/" as a directory part,
+the basename of the configuration file given by "syslog_ng_conf"
+as a basename part, ".log" as a suffix.
</longdesc>
<shortdesc lang="en">A destination of the debug log</shortdesc>
<content type="string" default=""/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.1.9+git24.9b664917/heartbeat/VIPArip
new/resource-agents-4.2.0+git33.69a622fd/heartbeat/VIPArip
--- old/resource-agents-4.1.9+git24.9b664917/heartbeat/VIPArip 2018-10-19
15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/heartbeat/VIPArip 2018-12-06
08:44:07.000000000 +0100
@@ -60,7 +60,7 @@
<parameter name="nic" unique="0">
<longdesc lang="en">
The nic for broadcast the route information.
-The ripd uses this nic to broadcast the route informaton to others
+The ripd uses this nic to broadcast the route information to others
</longdesc>
<shortdesc lang="en">The nic for broadcast the route information</shortdesc>
<content type="string" default="eth0"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.1.9+git24.9b664917/heartbeat/VirtualDomain
new/resource-agents-4.2.0+git33.69a622fd/heartbeat/VirtualDomain
--- old/resource-agents-4.1.9+git24.9b664917/heartbeat/VirtualDomain
2018-10-19 15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/heartbeat/VirtualDomain
2018-12-06 08:44:07.000000000 +0100
@@ -149,7 +149,7 @@
insert the suffix immediately prior to the first period (.) in the FQDN.
At the moment Qemu/KVM and Xen migration via a dedicated network is supported.
-Note: Be sure this composed host name is locally resolveable and the
+Note: Be sure this composed host name is locally resolvable and the
associated IP is reachable through the favored network. This suffix will
be added to the remoteuri and migrateuri parameters.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.1.9+git24.9b664917/heartbeat/aws-vpc-move-ip
new/resource-agents-4.2.0+git33.69a622fd/heartbeat/aws-vpc-move-ip
--- old/resource-agents-4.1.9+git24.9b664917/heartbeat/aws-vpc-move-ip
2018-10-19 15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/heartbeat/aws-vpc-move-ip
2018-12-06 08:44:07.000000000 +0100
@@ -167,9 +167,10 @@
ec2ip_monitor() {
if ocf_is_true ${OCF_RESKEY_monapi} || [ "$__OCF_ACTION" = "start" ] ||
ocf_is_probe; then
ocf_log info "monitor: check routing table (API call)"
- cmd="$OCF_RESKEY_awscli --profile $OCF_RESKEY_profile --output
text ec2 describe-route-tables --route-table-ids $OCF_RESKEY_routing_table"
+ cmd="$OCF_RESKEY_awscli --profile $OCF_RESKEY_profile --output
text ec2 describe-route-tables --route-table-ids $OCF_RESKEY_routing_table
--query
RouteTables[*].Routes[?DestinationCidrBlock=='$OCF_RESKEY_ip/32'].InstanceId"
ocf_log debug "executing command: $cmd"
- ROUTE_TO_INSTANCE="$($cmd | grep $OCF_RESKEY_ip | awk '{ print
$3 }')"
+ ROUTE_TO_INSTANCE=$($cmd)
+ ocf_log debug "Overlay IP is currently routed to
${ROUTE_TO_INSTANCE}"
if [ -z "$ROUTE_TO_INSTANCE" ]; then
ROUTE_TO_INSTANCE="<unknown>"
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.1.9+git24.9b664917/heartbeat/docker
new/resource-agents-4.2.0+git33.69a622fd/heartbeat/docker
--- old/resource-agents-4.1.9+git24.9b664917/heartbeat/docker 2018-10-19
15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/heartbeat/docker 2018-12-06
08:44:07.000000000 +0100
@@ -147,12 +147,12 @@
<parameter name="reuse" required="0" unique="0">
<longdesc lang="en">
-Allow the container to be reused after stopping the container. By default
-containers are removed after stop. With the reuse option containers
-will persist after the container stops.
+Allow the container to be reused once it is stopped. By default,
+containers get removed once they are stopped. Enable this option
+to have the particular one persist when this happens.
</longdesc>
<shortdesc lang="en">reuse container</shortdesc>
-<content type="boolean"/>
+<content type="boolean" default="0"/>
</parameter>
<parameter name="query_docker_health" required="0" unique="0">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.1.9+git24.9b664917/heartbeat/kamailio.in
new/resource-agents-4.2.0+git33.69a622fd/heartbeat/kamailio.in
--- old/resource-agents-4.1.9+git24.9b664917/heartbeat/kamailio.in
2018-10-19 15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/heartbeat/kamailio.in
2018-12-06 08:44:07.000000000 +0100
@@ -163,7 +163,7 @@
In order to respond with a 200 OK response to the SIP OOPTION requests,
the kamailio.cfg file needs to contain following section:
- Note: The following "kamailio.cfg" code sniplet is part of an XML section.
+ Note: The following "kamailio.cfg" code snippet is part of an XML section.
Therefore it contains two & characters, which need to be replaced
with two ampersand characters within "kamailio.cfg":
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.1.9+git24.9b664917/heartbeat/lxc.in
new/resource-agents-4.2.0+git33.69a622fd/heartbeat/lxc.in
--- old/resource-agents-4.1.9+git24.9b664917/heartbeat/lxc.in 2018-10-19
15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/heartbeat/lxc.in 2018-12-06
08:44:07.000000000 +0100
@@ -47,7 +47,6 @@
: ${OCF_RESKEY_log=${OCF_RESKEY_log_default}}
: ${OCF_RESKEY_use_screen=${OCF_RESKEY_use_screen_default}}
-
# Set default TRANS_RES_STATE (temporary file to "flag" if resource was stated
but not stopped)
TRANS_RES_STATE="${HA_RSCTMP}/${OCF_RESOURCE_INSTANCE}.state"
@@ -58,10 +57,10 @@
<resource-agent name="lxc">
<version>0.1</version>
<longdesc lang="en">Allows LXC containers to be managed by the cluster.
-If the container is running "init" it will also perform an orderly shutdown.
+Notes for lxc Versions before 1.0.0, where the Container is stopped using kill
-PWR instead of lxc-stop:
It is 'assumed' that the 'init' system will do an orderly shudown if presented
with a 'kill -PWR' signal.
On a 'sysvinit' this would require the container to have an inittab file
containing "p0::powerfail:/sbin/init 0"
-I have absolutly no idea how this is done with 'upstart' or 'systemd', YMMV if
your container is using one of them.</longdesc>
+</longdesc>
<shortdesc lang="en">Manages LXC containers</shortdesc>
<parameters>
@@ -91,7 +90,6 @@
<content type="boolean" default="${OCF_RESKEY_use_screen_default}"/>
</parameter>
-
</parameters>
<actions>
@@ -180,8 +178,7 @@
LXC_stop() {
- local shutdown_timeout
- local now
+
LXC_status
if [ $? -eq $OCF_NOT_RUNNING ]; then
ocf_log debug "Resource $OCF_RESOURCE_INSTANCE is already
stopped"
@@ -195,14 +192,30 @@
exit $OCF_ERR_GENERIC
fi
- # If the container is running "init" and is able to perform and orderly
shutdown, then it should be done.
- # It is 'assumed' that the 'init' system will do an orderly shudown if
presented with a 'kill -PWR' signal.
- # On a 'sysvinit' this would require the container to have an inittab
file containing "p0::powerfail:/sbin/init 0"
- declare -i PID=0
- declare CMD=
+ if ! ocf_version_cmp "`lxc_version`" 1.0.0 ; then
+ # Use lxc-stop if we are newer than 1.0.0
+ timeout=$(( ($OCF_RESKEY_CRM_meta_timeout/1000) -5 ))
+ ocf_log info "Stopping Container ${OCF_RESKEY_container} using
lxc-stop"
+ # lxc-stop will return failure even if it reached the timeout
and sucessfully hard-stopped the
+ # Container so we check below if the Container is really
stopped instead of using || exit $OCF_ERR_GENERIC
+ ocf_run lxc-stop -n "${OCF_RESKEY_container}" -t ${timeout}
+
+ LXC_status
+ if [ $? -eq $OCF_SUCCESS ]; then
+ # Try to manually hard-stop if the Container is still
running
+ ocf_run lxc-stop -n "${OCF_RESKEY_container}" -k ||
exit $OCF_ERR_GENERIC
+ fi
+
+ else
+ # Use kill -PWR
+ # If the container is running "init" and is able to perform and
orderly shutdown, then it should be done.
+ # It is 'assumed' that the 'init' system will do an orderly
shudown if presented with a 'kill -PWR' signal.
+ # On a 'sysvinit' this would require the container to have an
inittab file containing "p0::powerfail:/sbin/init 0"
+ local shutdown_timeout
+ local now
+ declare -i PID=0
+ declare CMD=
- # LXC prior 1.0.0
- if ocf_version_cmp "`lxc_version`" 1.0.0 ; then
# This should work for traditional 'sysvinit' and 'upstart'
lxc-ps --name "${OCF_RESKEY_container}" -- -C init -o pid,comm
|while read CN PID CMD ;do
[ $PID -gt 1 ] || continue
@@ -217,70 +230,37 @@
ocf_log info "Sending \"OS shut down\" instruction to"
${OCF_RESKEY_container} "as it was found to be using \"systemd\""
kill -PWR $PID
done
- else
- PID=$(lxc-info --name "${OCF_RESKEY_container}" -p -H)
-
- # If there is no PID the container seems to be down which
- # shouldn't happen.
- if [ $PID -eq 0 ]; then
- ocf_log err "${OCF_RESKEY_container} seems to run, but
has no PID."
- exit $OCF_ERR_GENERIC
- fi
-
- # Rescue me.
- if [ $PID -eq 1 ]; then
- ocf_log err "${OCF_RESKEY_container} seems to run with
PID 1 which cannot be."
- PID=0
- CMD=
- else
- CMD=$(ps -o comm= -p $PID)
- fi
-
- # This should work for traditional 'sysvinit' and 'upstart'
- if [ "$CMD" = "init" ]; then
- ocf_log info "Sending \"OS shut down\" instruction to"
${OCF_RESKEY_container} "as it was found to be using \"sysV init\" or
\"upstart\""
- kill -PWR $PID
- fi
-
- # This should work for containers using 'systemd' instead of
'init'
- if [ "$CMD" = "systemd" ]; then
- ocf_log info "Sending \"OS shut down\" instruction to"
${OCF_RESKEY_container} "as it was found to be using \"systemd\""
- kill -PWR $PID
- fi
- fi
- # The "shutdown_timeout" we use here is the operation
- # timeout specified in the CIB, minus 5 seconds
- now=$(date +%s)
- shutdown_timeout=$(( $now + ($OCF_RESKEY_CRM_meta_timeout/1000) -5 ))
- # Loop on status until we reach $shutdown_timeout
- while [ $now -lt $shutdown_timeout ]; do
- LXC_status
- status=$?
- case $status in
- "$OCF_NOT_RUNNING")
- ocf_run rm -f $TRANS_RES_STATE
- return $OCF_SUCCESS
- ;;
- "$OCF_SUCCESS")
- # Container is still running, keep waiting (until
- # shutdown_timeout expires)
- sleep 1
- ;;
- *)
- # Something went wrong. Bail out and
- # resort to forced stop (destroy).
- break;
- esac
- now=$(date +%s)
- done
+
+ # The "shutdown_timeout" we use here is the operation
+ # timeout specified in the CIB, minus 5 seconds
+ now=$(date +%s)
+ shutdown_timeout=$(( $now + ($OCF_RESKEY_CRM_meta_timeout/1000)
-5 ))
+ # Loop on status until we reach $shutdown_timeout
+ while [ $now -lt $shutdown_timeout ]; do
+ LXC_status
+ status=$?
+ case $status in
+ "$OCF_NOT_RUNNING")
+ ocf_run rm -f $TRANS_RES_STATE
+ return $OCF_SUCCESS
+ ;;
+ "$OCF_SUCCESS")
+ # Container is still running, keep waiting
(until
+ # shutdown_timeout expires)
+ sleep 1
+ ;;
+ *)
+ # Something went wrong. Bail out and
+ # resort to forced stop (destroy).
+ break;
+ esac
+ now=$(date +%s)
+ done
- # If the container is still running, it will be stopped now. regardless
of state!
- # LXC prior 1.0.0
- if ocf_version_cmp "`lxc_version`" 1.0.0 ; then
+ # If the container is still running, it will be stopped now.
regardless of state!
ocf_run lxc-stop -n ${OCF_RESKEY_container} || exit
$OCF_ERR_GENERIC
- else
- ocf_run lxc-stop -n ${OCF_RESKEY_container} -k || exit
$OCF_ERR_GENERIC
fi
+
ocf_log info "Container" ${OCF_RESKEY_container} "stopped"
ocf_run rm -f $TRANS_RES_STATE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.1.9+git24.9b664917/heartbeat/mpathpersist.in
new/resource-agents-4.2.0+git33.69a622fd/heartbeat/mpathpersist.in
--- old/resource-agents-4.1.9+git24.9b664917/heartbeat/mpathpersist.in
2018-10-19 15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/heartbeat/mpathpersist.in
2018-12-06 08:44:07.000000000 +0100
@@ -82,7 +82,7 @@
"mpathpersist" from multipath-tools is used, please see its documentation.
Should be used as multistate (Master/Slave) resource
Slave registers its node id ("crm_node -i") as reservation key ( --param-sark
) on each device in the params "devs" list.
-Master reservs all devices from params "devs" list with reservation
"--prout-type" value from "reservation_type" parameter.
+Master reserves all devices from params "devs" list with reservation
"--prout-type" value from "reservation_type" parameter.
Please see man sg_persist(8) and mpathpersist(8) for reservation_type details.
</longdesc>
<shortdesc lang="en">Manages SCSI persistent reservations on multipath
devices</shortdesc>
@@ -99,7 +99,7 @@
<parameter name="devs" unique="0" required="1">
<longdesc lang="en">
Device list. Multiple devices can be listed with blank space as separator.
-Shell wildcars are allowed.
+Shell wildcards are allowed.
</longdesc>
<shortdesc lang="en">device list</shortdesc>
<content type="string"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.1.9+git24.9b664917/heartbeat/ocf-distro
new/resource-agents-4.2.0+git33.69a622fd/heartbeat/ocf-distro
--- old/resource-agents-4.1.9+git24.9b664917/heartbeat/ocf-distro
2018-10-19 15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/heartbeat/ocf-distro
2018-12-06 08:44:07.000000000 +0100
@@ -39,7 +39,7 @@
VER=$(cat $_DEBIAN_VERSION_FILE)
elif [ -f $_REDHAT_RELEASE_FILE ]; then
OS=RedHat # redhat or similar
- VER= # here some complex sed script
+ VER=$(sed "s/.* release \([^ ]\+\).*/\1/" $_REDHAT_RELEASE_FILE)
else
OS=$(uname -s)
VER=$(uname -r)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.1.9+git24.9b664917/heartbeat/ocf-shellfuncs.in
new/resource-agents-4.2.0+git33.69a622fd/heartbeat/ocf-shellfuncs.in
--- old/resource-agents-4.1.9+git24.9b664917/heartbeat/ocf-shellfuncs.in
2018-10-19 15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/heartbeat/ocf-shellfuncs.in
2018-12-06 08:44:07.000000000 +0100
@@ -257,7 +257,7 @@
ha_debug() {
- if [ "x${HA_debug}" = "x0" ] ; then
+ if [ "x${HA_debug}" = "x0" ] || [ -z "${HA_debug}" ] ; then
return 0
fi
if tty >/dev/null; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.1.9+git24.9b664917/heartbeat/ocf.py
new/resource-agents-4.2.0+git33.69a622fd/heartbeat/ocf.py
--- old/resource-agents-4.1.9+git24.9b664917/heartbeat/ocf.py 2018-10-19
15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/heartbeat/ocf.py 2018-12-06
08:44:07.000000000 +0100
@@ -267,11 +267,12 @@
class Action(object):
- def __init__(self, name, timeout, interval, depth):
+ def __init__(self, name, timeout, interval, depth, role):
self.name = name
self.timeout = timeout
self.interval = interval
self.depth = depth
+ self.role = role
def __str__(self):
return self.to_xml()
@@ -287,6 +288,7 @@
ret = opt(ret, "timeout", self.timeout)
ret = opt(ret, "interval", self.interval)
ret = opt(ret, "depth", self.depth)
+ ret = opt(ret, "role", self.role)
ret += " />\n"
return ret
@@ -324,11 +326,12 @@
default=default))
return self
- def add_action(self, name, timeout=None, interval=None, depth=None,
handler=None):
+ def add_action(self, name, timeout=None, interval=None, depth=None,
role=None, handler=None):
self.actions.append(Action(name=name,
timeout=timeout,
interval=interval,
- depth=depth))
+ depth=depth,
+ role=role))
if handler is not None:
self._handlers[name] = handler
return self
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/resource-agents-4.1.9+git24.9b664917/heartbeat/pgsql
new/resource-agents-4.2.0+git33.69a622fd/heartbeat/pgsql
--- old/resource-agents-4.1.9+git24.9b664917/heartbeat/pgsql 2018-10-19
15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/heartbeat/pgsql 2018-12-06
08:44:07.000000000 +0100
@@ -289,7 +289,7 @@
"slave" means that RA only makes recovery.conf before starting
to connect to primary which is running somewhere.
-It dosen't need master/slave setting.
+It doesn't need master/slave setting.
It requires master_ip restore_command parameters.
</longdesc>
<shortdesc lang="en">rep_mode</shortdesc>
@@ -383,7 +383,7 @@
If the node name contains a upper case letter, hyphen and dot, those
characters will be converted to a lower case letter or an underscore.
For example, Node-1.example.com to node_1_example_com.
-pgsql RA doesn't monitor and delete the repliation slot.
+pgsql RA doesn't monitor and delete the replication slot.
When the slave node has been disconnected in failure or the like, execute one
of the following manually.
Otherwise it may eventually cause a disk full because the master node will
continue to accumulate the unsent WAL.
1. recover and reconnect the slave node to the master node as soon as possible.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.1.9+git24.9b664917/heartbeat/podman
new/resource-agents-4.2.0+git33.69a622fd/heartbeat/podman
--- old/resource-agents-4.1.9+git24.9b664917/heartbeat/podman 2018-10-19
15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/heartbeat/podman 2018-12-06
08:44:07.000000000 +0100
@@ -148,12 +148,12 @@
<parameter name="reuse" required="0" unique="0">
<longdesc lang="en">
-Allow the container to be reused after stopping the container. By default
-containers are removed after stop. With the reuse option containers
-will persist after the container stops.
+Allow the container to be reused once it is stopped. By default,
+containers get removed once they are stopped. Enable this option
+to have the particular one persist when this happens.
</longdesc>
<shortdesc lang="en">reuse container</shortdesc>
-<content type="boolean"/>
+<content type="boolean" default="0"/>
</parameter>
</parameters>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.1.9+git24.9b664917/heartbeat/rabbitmq-cluster
new/resource-agents-4.2.0+git33.69a622fd/heartbeat/rabbitmq-cluster
--- old/resource-agents-4.1.9+git24.9b664917/heartbeat/rabbitmq-cluster
2018-10-19 15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/heartbeat/rabbitmq-cluster
2018-12-06 08:44:07.000000000 +0100
@@ -184,6 +184,18 @@
return $OCF_SUCCESS
else
ocf_log debug "RabbitMQ application is stopped"
+ rmq_delete_nodename
+ return $OCF_NOT_RUNNING
+ fi
+}
+
+rmq_node_alive() {
+ if $RMQ_CTL eval 'ok.'; then
+ ocf_log debug "RabbitMQ node is alive"
+ return $OCF_SUCCESS
+ else
+ ocf_log debug "RabbitMQ node is down"
+ rmq_delete_nodename
return $OCF_NOT_RUNNING
fi
}
@@ -191,7 +203,8 @@
rmq_monitor() {
local rc
- if $RMQ_CTL eval 'rabbit_mnesia:cluster_status_from_mnesia().' | grep
-q '^{ok'; then
+ status=$($RMQ_CTL eval 'rabbit_mnesia:cluster_status_from_mnesia().'
2>&1)
+ if echo "${status}" | grep -q '^{ok'; then
pcs_running=$(rmq_join_list | wc -w)
ocf_log debug "Pacemaker thinks ${pcs_running} RabbitMQ nodes
are running"
rmq_running=$($RMQ_CTL eval
'length(mnesia:system_info(running_db_nodes)).')
@@ -209,6 +222,7 @@
return $OCF_SUCCESS
else
ocf_log info "RabbitMQ server could not get cluster status from
mnesia"
+ ocf_log debug "${status}"
rmq_delete_nodename
return $OCF_NOT_RUNNING
fi
@@ -514,7 +528,7 @@
end.
"
- rmq_app_running
+ rmq_node_alive
if [ $? -eq $OCF_NOT_RUNNING ]; then
return $OCF_SUCCESS
fi
@@ -542,6 +556,7 @@
sleep 1
done
+ rmq_delete_nodename
remove_pid
return $OCF_SUCCESS
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/resource-agents-4.1.9+git24.9b664917/heartbeat/rkt
new/resource-agents-4.2.0+git33.69a622fd/heartbeat/rkt
--- old/resource-agents-4.1.9+git24.9b664917/heartbeat/rkt 2018-10-19
15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/heartbeat/rkt 2018-12-06
08:44:07.000000000 +0100
@@ -433,7 +433,6 @@
# TODO :
# When a user starts plural clones in a node in globally-unique, a user cannot
appoint plural name parameters.
-# When a user appoints reuse, the resource agent cannot connect plural clones
with a container.
if ocf_is_true "$OCF_RESKEY_CRM_meta_globally_unique"; then
if [ -n "$OCF_RESKEY_name" ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.1.9+git24.9b664917/heartbeat/sg_persist.in
new/resource-agents-4.2.0+git33.69a622fd/heartbeat/sg_persist.in
--- old/resource-agents-4.1.9+git24.9b664917/heartbeat/sg_persist.in
2018-10-19 15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/heartbeat/sg_persist.in
2018-12-06 08:44:07.000000000 +0100
@@ -74,7 +74,7 @@
"sg_persist" from sg3_utils is used, please see its documentation.
Should be used as multistate (Master/Slave) resource
Slave registers its node id ("crm_node -i") as reservation key ( --param-rk )
on each device in the "devs" list.
-Master reservs all devices from "devs" list with reservation "--prout-type"
value from "reservation_type" parameter.
+Master reserves all devices from "devs" list with reservation "--prout-type"
value from "reservation_type" parameter.
</longdesc>
<shortdesc lang="en">Manages SCSI PERSISTENT RESERVATIONS</shortdesc>
@@ -90,7 +90,7 @@
<parameter name="devs" unique="0" required="1">
<longdesc lang="en">
Device list. Multiple devices can be listed with blank space as separator.
-Shell wildcars are allowed.
+Shell wildcards are allowed.
</longdesc>
<shortdesc lang="en">device list</shortdesc>
<content type="string"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.1.9+git24.9b664917/heartbeat/tomcat
new/resource-agents-4.2.0+git33.69a622fd/heartbeat/tomcat
--- old/resource-agents-4.1.9+git24.9b664917/heartbeat/tomcat 2018-10-19
15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/heartbeat/tomcat 2018-12-06
08:44:07.000000000 +0100
@@ -613,7 +613,6 @@
TOMCAT_CONSOLE="${OCF_RESKEY_script_log-/var/log/$TOMCAT_NAME.log}"
RESOURCE_TOMCAT_USER="${OCF_RESKEY_tomcat_user-root}"
RESOURCE_STATUSURL="${OCF_RESKEY_statusurl-http://127.0.0.1:8080}";
-OCF_RESKEY_force_systemd_default=0
JAVA_HOME="${OCF_RESKEY_java_home}"
JAVA_OPTS="${OCF_RESKEY_java_opts}"
@@ -630,6 +629,13 @@
CATALINA_PID="${HA_RSCTMP}/${TOMCAT_NAME}_tomcatstate/catalina.pid"
fi
+# Only default to true for RedHat systems without catalina.sh
+if [ -e "$CATALINA_HOME/bin/catalina.sh" ] || ! is_redhat_based; then
+ OCF_RESKEY_force_systemd_default=0
+else
+ OCF_RESKEY_force_systemd_default=1
+fi
+
MAX_STOP_TIME="${OCF_RESKEY_max_stop_time}"
: ${OCF_RESKEY_force_systemd=${OCF_RESKEY_force_systemd_default}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.1.9+git24.9b664917/make/spellcheck-ignore
new/resource-agents-4.2.0+git33.69a622fd/make/spellcheck-ignore
--- old/resource-agents-4.1.9+git24.9b664917/make/spellcheck-ignore
1970-01-01 01:00:00.000000000 +0100
+++ new/resource-agents-4.2.0+git33.69a622fd/make/spellcheck-ignore
2018-12-06 08:44:07.000000000 +0100
@@ -0,0 +1,165 @@
+personal_ws-1.1 en 500
+abap
+acpi
+addrlabel
+arping
+ase
+asm
+async
+awscli
+backend
+basename
+cfg
+chroot
+chrooted
+cib
+cidr
+cli
+clvmd
+cmd
+cmirrord
+conf
+config
+conntrackd
+corosync
+crm
+cron
+csync
+ctdb
+ctl
+dev
+devs
+dhcp
+dhcpd
+dirs
+dlm
+dname
+dns
+edirectory
+exportfs
+failover
+filesystem
+fio
+fsck
+fsid
+fstype
+ftpd
+fullname
+galera
+gid
+hostname
+init
+ipaddr
+ipc
+iptables
+iscsi
+isql
+jboss
+jira
+jvm
+kamailio
+kamctl
+ldap
+ldapsearch
+libvirt
+libvirtd
+localhost
+lockd
+logfile
+loopback
+lvm
+lvmlockd
+lxc
+lxd
+malloc
+manpage
+minio
+mkdir
+mpathpersist
+multipath
+multistate
+mybackend
+mysqld
+nagios
+netmask
+nfs
+nfsd
+ng
+ng's
+nginx
+nof
+nsenter
+ocf
+ocs
+olcpidfile
+openstack
+openvz
+oradebug
+orauser
+param
+params
+pcmk
+pgsql
+pid
+pidfile
+pingd
+pipefs
+pkill
+podman
+portblock
+postfix
+proftpd
+prout
+qdisk
+qemu
+rabbitmq
+rk
+rkt
+rpc
+rsync
+rsyncd
+rsyslog
+rundir
+runtime
+sanlock
+sapcontrol
+saphostagent
+sapinstance
+sark
+sbin
+sg
+sigkill
+sigterm
+slapd
+statusurl
+stderr
+stdout
+stonith
+subdirectory
+subnet
+sunrpc
+sybase
+symlink
+sysconfig
+syslog
+systemd
+tcp
+udp
+ulimit
+uri
+usr
+utils
+varnishd
+vcl
+virsh
+virtualized
+vlan
+vmware
+vmx
+vsftpd
+wget
+whitespace
+xen
+xinetd
+zabbix
+zfs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.1.9+git24.9b664917/resource-agents.spec.in
new/resource-agents-4.2.0+git33.69a622fd/resource-agents.spec.in
--- old/resource-agents-4.1.9+git24.9b664917/resource-agents.spec.in
2018-10-19 15:20:26.000000000 +0200
+++ new/resource-agents-4.2.0+git33.69a622fd/resource-agents.spec.in
2018-12-06 08:44:07.000000000 +0100
@@ -14,6 +14,22 @@
%global numcomm @numcomm@
%global dirty @dirty@
+# Whether this platform defaults to using systemd as an init system
+# (needs to be evaluated prior to BuildRequires being enumerated and
+# installed as it's intended to conditionally select some of these, and
+# for that there are only few indicators with varying reliability:
+# - presence of systemd-defined macros (when building in a full-fledged
+# environment, which is not the case with ordinary mock-based builds)
+# - systemd-aware rpm as manifested with the presence of particular
+# macro (rpm itself will trivially always be present when building)
+# - existence of /usr/lib/os-release file, which is something heavily
+# propagated by systemd project
+# - when not good enough, there's always a possibility to check
+# particular distro-specific macros (incl. version comparison)
+%define systemd_native (%{?_unitdir:1}%{!?_unitdir:0}%{nil \
+ } ||
%{?__transaction_systemd_inhibit:1}%{!?__transaction_systemd_inhibit:0}%{nil \
+ } || %(test -f /usr/lib/os-release; test $? -ne 0; echo $?))
+
#
# Since this spec file supports multiple distributions, ensure we
# use the correct group for each.
@@ -162,10 +178,10 @@
Requires(post): /sbin/chkconfig
Requires(preun):/sbin/chkconfig
%endif
-%if %{defined systemd_requires}
+%if %{systemd_native}
BuildRequires: systemd
-%{?systemd_requires}
%endif
+%{?systemd_requires}
%description -n ldirectord
The Linux Director Daemon (ldirectord) was written by Jacob Rief.
