Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package resource-agents for openSUSE:Factory
checked in at 2022-05-04 15:10:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/resource-agents (Old)
and /work/SRC/openSUSE:Factory/.resource-agents.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "resource-agents"
Wed May 4 15:10:23 2022 rev:116 rq:974232 version:4.11.0+git8.2351f1d4
Changes:
--------
--- /work/SRC/openSUSE:Factory/resource-agents/resource-agents.changes
2022-04-16 00:13:26.765584756 +0200
+++
/work/SRC/openSUSE:Factory/.resource-agents.new.1538/resource-agents.changes
2022-05-04 15:10:34.268129270 +0200
@@ -1,0 +2,14 @@
+Sun May 01 22:04:58 UTC 2022 - [email protected]
+
+- Update to version 4.11.0+git8.2351f1d4:
+ * oracle: Improve the error message if monpassword was not set. (#1767)
+ * spec: remove redhat-lsb-core dependency (lsb_release)
+ * podman: add podman parameter error judgment (#1764)
+ * ethmonitor,ovsmonitor,mariadb: check for bc binary
+ * ocivip: fix spelling errors
+ * build: update ChangeLog for 4.11.0
+ * storage-mon,ldirectord: fix spelling errors
+ * db2: fix bashism
+ * openstack-info: fix bashism
+
+-------------------------------------------------------------------
Old:
----
resource-agents-4.11.0rc1+git2.d40f1f1b.tar.xz
New:
----
resource-agents-4.11.0+git8.2351f1d4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ resource-agents.spec ++++++
--- /var/tmp/diff_new_pack.0sWMC4/_old 2022-05-04 15:10:34.968130130 +0200
+++ /var/tmp/diff_new_pack.0sWMC4/_new 2022-05-04 15:10:34.976130140 +0200
@@ -17,7 +17,7 @@
Name: resource-agents
-Version: 4.11.0rc1+git2.d40f1f1b
+Version: 4.11.0+git8.2351f1d4
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
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.0sWMC4/_old 2022-05-04 15:10:35.076130263 +0200
+++ /var/tmp/diff_new_pack.0sWMC4/_new 2022-05-04 15:10:35.080130268 +0200
@@ -1,7 +1,7 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/ClusterLabs/resource-agents.git</param>
-<param name="changesrevision">26de0ad2f0f975166fe79ef72ab08e2c03519eea</param>
+<param name="changesrevision">2351f1d4041129041469c75039c275792e1aafd1</param>
</service>
</servicedata>
(No newline at EOF)
++++++ resource-agents-4.11.0rc1+git2.d40f1f1b.tar.xz ->
resource-agents-4.11.0+git8.2351f1d4.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/resource-agents-4.11.0rc1+git2.d40f1f1b/ChangeLog
new/resource-agents-4.11.0+git8.2351f1d4/ChangeLog
--- old/resource-agents-4.11.0rc1+git2.d40f1f1b/ChangeLog 2022-03-31
14:53:22.000000000 +0200
+++ new/resource-agents-4.11.0+git8.2351f1d4/ChangeLog 2022-04-29
09:05:49.000000000 +0200
@@ -1,3 +1,8 @@
+* Wed Apr 6 2022 resource-agents contributors
+- stable release 4.11.0
+- Filesystem: fix logic for UUID/label devices with space between parameter
and UUID/label
+- db2/openstack-info: fix bashisms
+
* Wed Mar 30 2022 resource-agents contributors
- release candidate 4.11.0 rc1
- corosync-qnetd: new resource agent
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.11.0rc1+git2.d40f1f1b/heartbeat/db2
new/resource-agents-4.11.0+git8.2351f1d4/heartbeat/db2
--- old/resource-agents-4.11.0rc1+git2.d40f1f1b/heartbeat/db2 2022-03-31
14:53:22.000000000 +0200
+++ new/resource-agents-4.11.0+git8.2351f1d4/heartbeat/db2 2022-04-29
09:05:49.000000000 +0200
@@ -407,7 +407,7 @@
# partition is explicitly specified, activate without
# partition information. This allows db2 instances without
# partition support to be managed.
- if [ -z "$OCF_RESKEY_dbpartitionnum" ] && ! [ -a "$db2sql/db2nodes.cfg" ];
then
+ if [ -z "$OCF_RESKEY_dbpartitionnum" ] && ! [ -e "$db2sql/db2nodes.cfg" ];
then
start_opts=""
fi
@@ -511,7 +511,7 @@
rc=$OCF_SUCCESS
- if [ -z "$OCF_RESKEY_dbpartitionnum" ] && ! [ -a "$db2sql/db2nodes.cfg" ];
then
+ if [ -z "$OCF_RESKEY_dbpartitionnum" ] && ! [ -e "$db2sql/db2nodes.cfg" ];
then
stop_opts=""
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.11.0rc1+git2.d40f1f1b/heartbeat/ethmonitor
new/resource-agents-4.11.0+git8.2351f1d4/heartbeat/ethmonitor
--- old/resource-agents-4.11.0rc1+git2.d40f1f1b/heartbeat/ethmonitor
2022-03-31 14:53:22.000000000 +0200
+++ new/resource-agents-4.11.0+git8.2351f1d4/heartbeat/ethmonitor
2022-04-29 09:05:49.000000000 +0200
@@ -545,6 +545,7 @@
if_validate() {
check_binary $IP2UTIL
check_binary arping
+ check_binary bc
if_init
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.11.0rc1+git2.d40f1f1b/heartbeat/mariadb.in
new/resource-agents-4.11.0+git8.2351f1d4/heartbeat/mariadb.in
--- old/resource-agents-4.11.0rc1+git2.d40f1f1b/heartbeat/mariadb.in
2022-03-31 14:53:22.000000000 +0200
+++ new/resource-agents-4.11.0+git8.2351f1d4/heartbeat/mariadb.in
2022-04-29 09:05:49.000000000 +0200
@@ -988,6 +988,10 @@
esac
}
+mysql_validate() {
+ check_binary bc
+}
+
#######################################################################
@@ -1049,7 +1053,7 @@
promote) mysql_promote;;
demote) mysql_demote;;
notify) mysql_notify;;
- validate-all) exit $OCF_SUCCESS;;
+ validate-all) mysql_validate;;
*) usage
exit $OCF_ERR_UNIMPLEMENTED;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.11.0rc1+git2.d40f1f1b/heartbeat/ocivip
new/resource-agents-4.11.0+git8.2351f1d4/heartbeat/ocivip
--- old/resource-agents-4.11.0rc1+git2.d40f1f1b/heartbeat/ocivip
2022-03-31 14:53:22.000000000 +0200
+++ new/resource-agents-4.11.0+git8.2351f1d4/heartbeat/ocivip 2022-04-29
09:05:49.000000000 +0200
@@ -23,12 +23,12 @@
#
# Prerequisites:
#
-# - OCI CLI installed
(https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/climanualinst.htm)
+# - OCI CLI installed
(https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/climanualinst.htm)
# - jq installed
# - dynamic group with a policy attacched
# - the policy must have this statement:
# allow dynamic-group <GROUP_NAME> to use virtual-network-family in
compartment id <COMPARTMENT_ID>
-# - a reserved secondary private IP address for Compute Instances high
availablity
+# - a reserved secondary private IP address for Compute Instances high
availability
#
#######################################################################
@@ -73,7 +73,7 @@
- jq installed
- dynamic group with a policy attacched
- the policy must have this statement: allow dynamic-group GROUP_NAME to use
virtual-network-family in compartment id COMPARTMENT_ID
-- a reserved secondary private IP address for Compute Instances high
availablity
+- a reserved secondary private IP address for Compute Instances high
availability
</longdesc>
<shortdesc lang="en">OCI Secondary Private IP Address for Compute instances
Resource Agent</shortdesc>
@@ -260,4 +260,4 @@
rc=$?
ocf_log debug "${OCF_RESOURCE_INSTANCE} $__OCF_ACTION : $rc"
-exit $rc
\ No newline at end of file
+exit $rc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.11.0rc1+git2.d40f1f1b/heartbeat/openstack-info.in
new/resource-agents-4.11.0+git8.2351f1d4/heartbeat/openstack-info.in
--- old/resource-agents-4.11.0rc1+git2.d40f1f1b/heartbeat/openstack-info.in
2022-03-31 14:53:22.000000000 +0200
+++ new/resource-agents-4.11.0+git8.2351f1d4/heartbeat/openstack-info.in
2022-04-29 09:05:49.000000000 +0200
@@ -167,9 +167,9 @@
--column fixed_ips \
${port_id} | grep -P '\"subnet_id\": \".*\",$' |
grep -P -o '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}')
- value+="${subnet_id}:${port_id},"
+ value="${value}${subnet_id}:${port_id},"
done
- value=$(echo ${value} | sed -e 's/,$//g')
+ value=${value%,}
${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -n openstack_ports -v
"$value"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.11.0rc1+git2.d40f1f1b/heartbeat/oracle
new/resource-agents-4.11.0+git8.2351f1d4/heartbeat/oracle
--- old/resource-agents-4.11.0rc1+git2.d40f1f1b/heartbeat/oracle
2022-03-31 14:53:22.000000000 +0200
+++ new/resource-agents-4.11.0+git8.2351f1d4/heartbeat/oracle 2022-04-29
09:05:49.000000000 +0200
@@ -444,7 +444,7 @@
fi
if [ -z "$OCF_RESKEY_monpassword" ]; then
- ocf_exit_reason "Please explicitly set a password for $MONUSR
oracle user"
+ ocf_exit_reason "Resource param 'monpassword' not set. Please
configure monpassword for $MONUSR oracle user"
exit $OCF_ERR_CONFIGURED
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.11.0rc1+git2.d40f1f1b/heartbeat/ovsmonitor
new/resource-agents-4.11.0+git8.2351f1d4/heartbeat/ovsmonitor
--- old/resource-agents-4.11.0rc1+git2.d40f1f1b/heartbeat/ovsmonitor
2022-03-31 14:53:22.000000000 +0200
+++ new/resource-agents-4.11.0+git8.2351f1d4/heartbeat/ovsmonitor
2022-04-29 09:05:49.000000000 +0200
@@ -437,6 +437,7 @@
check_binary ovs-vsctl
check_binary ovs-appctl
check_binary ovs-ofctl
+ check_binary bc
if_init
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.11.0rc1+git2.d40f1f1b/heartbeat/podman
new/resource-agents-4.11.0+git8.2351f1d4/heartbeat/podman
--- old/resource-agents-4.11.0rc1+git2.d40f1f1b/heartbeat/podman
2022-03-31 14:53:22.000000000 +0200
+++ new/resource-agents-4.11.0+git8.2351f1d4/heartbeat/podman 2022-04-29
09:05:49.000000000 +0200
@@ -376,6 +376,11 @@
# with the same name, even though podman itself thinks there
# is no such container. If so, purge the storage layer to try
# to clean the corruption and try again.
+ if echo "$out" | grep -q "unknown.*flag"; then
+ ocf_exit_reason "$out"
+ return $rc
+ fi
+
ocf_log warn "Internal podman error while creating new
container $CONTAINER. Retrying."
ocf_run podman rm --storage $CONTAINER
ocf_run podman run $opts $image $cmd
@@ -438,6 +443,10 @@
# we already know at this point it wouldn't be running
remove_container
run_new_container "$run_opts" $OCF_RESKEY_image
"$OCF_RESKEY_run_cmd"
+ if [ $? -eq 125 ]; then
+ return $OCF_ERR_GENERIC
+ fi
+
fi
rc=$?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.11.0rc1+git2.d40f1f1b/heartbeat/storage-mon.in
new/resource-agents-4.11.0+git8.2351f1d4/heartbeat/storage-mon.in
--- old/resource-agents-4.11.0rc1+git2.d40f1f1b/heartbeat/storage-mon.in
2022-03-31 14:53:22.000000000 +0200
+++ new/resource-agents-4.11.0+git8.2351f1d4/heartbeat/storage-mon.in
2022-04-29 09:05:49.000000000 +0200
@@ -100,7 +100,7 @@
<parameter name="io_timeout" unique="0">
<longdesc lang="en">
-Specify disk I/O timeout in seconds. Minimum 1, recommeded 10 (default).
+Specify disk I/O timeout in seconds. Minimum 1, recommended 10 (default).
</longdesc>
<shortdesc lang="en">Disk I/O timeout</shortdesc>
<content type="integer" default="${OCF_RESKEY_io_timeout_default}" />
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.11.0rc1+git2.d40f1f1b/ldirectord/ldirectord.in
new/resource-agents-4.11.0+git8.2351f1d4/ldirectord/ldirectord.in
--- old/resource-agents-4.11.0rc1+git2.d40f1f1b/ldirectord/ldirectord.in
2022-03-31 14:53:22.000000000 +0200
+++ new/resource-agents-4.11.0+git8.2351f1d4/ldirectord/ldirectord.in
2022-04-29 09:05:49.000000000 +0200
@@ -345,7 +345,7 @@
If I<yes>, then when real or failback servers are determined
to be down, they are readded to the kernel's LVS table with weight 0 if
-they do not exist in the table. Setting the value to no, allows manually
+they do not exist in the table. Setting the value to no, allows manually
removing the realserver to manually disable all persistent connections.
B<cleanstop = >B<yes> | B<no>
@@ -426,7 +426,7 @@
two strings must be quoted. If the request string starts with I<http://...>
the IP-address and port of the real server is overridden, otherwise the
IP-address and port of the real server is used.
-The last two optionals arguments set lower and upper connnection thresholds
+The last two optionals arguments set lower and upper connection thresholds
for real servers using -y and -x ipvsadm argument.
=head2
@@ -2159,7 +2159,7 @@
$new_rsrv->{"receive"} = $2;
$flags = $3;
}
- #threshold
+ #threshold
#"<l:l-threshold>"
if(defined($flags) and $flags =~ /\s+l:(\d+)(.*)/) {
$new_rsrv->{"l-threshold"} = $1;
@@ -4102,7 +4102,7 @@
$ipvsadm_args = "$$v{proto} " . &get_virtual_option($v)
. " -x $uthreshold -y $lthreshold" #threshold
- . " -r $rservice $rforw -w $rwght";
+ . " -r $rservice $rforw -w $rwght";
$log_args = "$tag server: $rservice "
. "(" #. scalar(%{$v->{real_status}})
. &get_virtual($v) . ")";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.11.0rc1+git2.d40f1f1b/resource-agents.spec.in
new/resource-agents-4.11.0+git8.2351f1d4/resource-agents.spec.in
--- old/resource-agents-4.11.0rc1+git2.d40f1f1b/resource-agents.spec.in
2022-03-31 14:53:22.000000000 +0200
+++ new/resource-agents-4.11.0+git8.2351f1d4/resource-agents.spec.in
2022-04-29 09:05:49.000000000 +0200
@@ -133,9 +133,6 @@
%endif
Requires: /usr/sbin/rpc.nfsd /usr/sbin/rpc.mountd
-# ocf-distro
-Requires: /usr/bin/lsb_release
-
# rgmanager
%if %{with rgmanager}
# ip.sh
