Hello community,
here is the log from the commit of package resource-agents for openSUSE:Factory
checked in at 2019-06-07 12:18:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/resource-agents (Old)
and /work/SRC/openSUSE:Factory/.resource-agents.new.4811 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "resource-agents"
Fri Jun 7 12:18:35 2019 rev:96 rq:707647 version:4.2.0+git122.571ed619
Changes:
--------
--- /work/SRC/openSUSE:Factory/resource-agents/resource-agents.changes
2019-06-01 09:42:28.195468285 +0200
+++
/work/SRC/openSUSE:Factory/.resource-agents.new.4811/resource-agents.changes
2019-06-07 12:18:35.856786044 +0200
@@ -1,0 +2,8 @@
+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
+
+-------------------------------------------------------------------
@@ -12 +20 @@
- * CTDB: fix version string with vendor trailer comparison
+ * CTDB: fix version string with vendor trailer comparison (bsc#1133337)
Old:
----
resource-agents-4.2.0+git116.b6c0f9fb.tar.xz
New:
----
resource-agents-4.2.0+git122.571ed619.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ resource-agents.spec ++++++
--- /var/tmp/diff_new_pack.7iEcgN/_old 2019-06-07 12:18:36.312785899 +0200
+++ /var/tmp/diff_new_pack.7iEcgN/_new 2019-06-07 12:18:36.312785899 +0200
@@ -17,7 +17,7 @@
Name: resource-agents
-Version: 4.2.0+git116.b6c0f9fb
+Version: 4.2.0+git122.571ed619
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.7iEcgN/_old 2019-06-07 12:18:36.364785883 +0200
+++ /var/tmp/diff_new_pack.7iEcgN/_new 2019-06-07 12:18:36.368785882 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/ClusterLabs/resource-agents.git</param>
-<param name="changesrevision">b6c0f9fba441190aa9e12ce492cbfe9cdbc7e922</param>
+<param name="changesrevision">571ed6199b7ef8c5de199e18e7577153efc7c826</param>
</service>
</servicedata>
\ No newline at end of file
++++++ resource-agents-4.2.0+git116.b6c0f9fb.tar.xz ->
resource-agents-4.2.0+git122.571ed619.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.2.0+git116.b6c0f9fb/heartbeat/Squid.in
new/resource-agents-4.2.0+git122.571ed619/heartbeat/Squid.in
--- old/resource-agents-4.2.0+git116.b6c0f9fb/heartbeat/Squid.in
2019-05-21 17:13:37.000000000 +0200
+++ new/resource-agents-4.2.0+git122.571ed619/heartbeat/Squid.in
2019-06-04 12:00:08.000000000 +0200
@@ -173,7 +173,9 @@
SQUID_PIDS[0]=$(pgrep -f "$PROCESS_PATTERN")
# Seek by child process
- SQUID_PIDS[1]=$(pgrep -P ${SQUID_PIDS[0]})
+ if [[ -n "${SQUID_PIDS[0]}" ]]; then
+ SQUID_PIDS[1]=$(pgrep -P ${SQUID_PIDS[0]})
+ fi
if [[ -n "${SQUID_PIDS[1]}" ]]; then
typeset exe
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.2.0+git116.b6c0f9fb/heartbeat/azure-events.in
new/resource-agents-4.2.0+git122.571ed619/heartbeat/azure-events.in
--- old/resource-agents-4.2.0+git116.b6c0f9fb/heartbeat/azure-events.in
2019-05-21 17:13:37.000000000 +0200
+++ new/resource-agents-4.2.0+git122.571ed619/heartbeat/azure-events.in
2019-06-04 12:00:08.000000000 +0200
@@ -206,6 +206,7 @@
val = clusterHelper._exec("crm_attribute",
"--name", key,
"--query",
"--quiet",
+ "--default",
"",
clusterHelper._getLocation(node))
ocf.logger.debug("getAttr: finished")
if not val:
@@ -221,7 +222,7 @@
nodes = []
nodeList = clusterHelper._exec("crm_node", "--list")
- for n in nodeList.split("\n"):
+ for n in nodeList.decode().split("\n"):
nodes.append(n.split()[1])
ocf.logger.debug("getAllNodes: finished; return %s" %
str(nodes))
@@ -292,7 +293,7 @@
ocf.logger.warning("transitionSummary: received
unexpected transition summary: %s" % summary)
return False
summary = summary.split("Transition Summary:")[1]
- ret = summary.split("\n").pop(0)
+ ret = summary.decode().split("\n").pop(0)
ocf.logger.debug("transitionSummary: finished; return = %s" %
str(ret))
return ret
@@ -313,7 +314,7 @@
if len(resources) == 0:
ret = []
else:
- ret = resources.split("\n")
+ ret = resources.decode().split("\n")
ocf.logger.debug("listOperationsOnNode: finished; return = %s"
% str(ret))
return ret
@@ -459,7 +460,7 @@
eventIDStr = clusterHelper.getAttr(attr_pendingEventIDs,
node=node)
if eventIDStr:
- eventIDs = eventIDStr.split(",")
+ eventIDs = eventIDStr.decode().split(",")
else:
eventIDs = None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/resource-agents-4.2.0+git116.b6c0f9fb/heartbeat/galera
new/resource-agents-4.2.0+git122.571ed619/heartbeat/galera
--- old/resource-agents-4.2.0+git116.b6c0f9fb/heartbeat/galera 2019-05-21
17:13:37.000000000 +0200
+++ new/resource-agents-4.2.0+git122.571ed619/heartbeat/galera 2019-06-04
12:00:08.000000000 +0200
@@ -82,6 +82,13 @@
fi
#######################################################################
+# Defaults:
+
+OCF_RESKEY_check_passwd_use_empty_default=0
+
+:
${OCF_RESKEY_check_passwd_use_empty=${OCF_RESKEY_check_passwd_use_empty_default}}
+
+#######################################################################
usage() {
cat <<UEND
@@ -243,12 +250,23 @@
<parameter name="check_passwd" unique="0" required="0">
<longdesc lang="en">
-Cluster check user password
+Cluster check user password. Empty passwords are ignored unless
+the parameter "check_passwd_use_empty" is set to 1.
</longdesc>
<shortdesc lang="en">check password</shortdesc>
<content type="string" default="" />
</parameter>
+<parameter name="check_passwd_use_empty" unique="0" required="0">
+<longdesc lang="en">
+Use an empty "check_passwd" password. If this parameter is set to 1,
+"check_passwd" will be ignored and an empty password is used
+when calling the "mysql" client binary.
+</longdesc>
+<shortdesc lang="en">check password use empty</shortdesc>
+<content type="boolean"
default="${OCF_RESKEY_check_passwd_use_empty_default}"/>
+</parameter>
+
</parameters>
<actions>
@@ -956,7 +974,10 @@
: ${OCF_RESKEY_check_user="root"}
MYSQL_OPTIONS_CHECK="-nNE --user=${OCF_RESKEY_check_user}"
-if [ -n "${OCF_RESKEY_check_passwd}" ]; then
+
+if ocf_is_true "${OCF_RESKEY_check_passwd_use_empty}"; then
+ MYSQL_OPTIONS_CHECK="$MYSQL_OPTIONS_CHECK --password=''"
+elif [ -n "${OCF_RESKEY_check_passwd}" ]; then
MYSQL_OPTIONS_CHECK="$MYSQL_OPTIONS_CHECK
--password=${OCF_RESKEY_check_passwd}"
fi
