Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2017-11-13 14:07:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "crmsh" Mon Nov 13 14:07:28 2017 rev:132 rq:541206 version:4.0.0+git.1510563824.1aecfa01 Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-11-10 14:58:03.854630965 +0100 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-11-13 14:07:55.349858835 +0100 @@ -1,0 +2,10 @@ +Mon Nov 13 09:04:41 UTC 2017 - kgronl...@suse.com + +- Update to version 4.0.0+git.1510563824.1aecfa01: + * high: utils: Use python3 in util scripts (bsc#1067823) + * high: bootstrap: Use firewall-offline-cmd for firewalld (bsc#1067498) + * medium: hb_report: Verify corosync.conf exists before opening it (bsc#1067456) + * low: config: Collect /var/log/ha-cluster-bootstrap.log (bsc#1067438) + * medium: bootstrap: Avoid SSH to localhost (bsc#1067324) + +------------------------------------------------------------------- Old: ---- crmsh-4.0.0+git.1510233955.43c72bf7.tar.bz2 New: ---- crmsh-4.0.0+git.1510563824.1aecfa01.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.2e6zUC/_old 2017-11-13 14:07:56.365822282 +0100 +++ /var/tmp/diff_new_pack.2e6zUC/_new 2017-11-13 14:07:56.369822138 +0100 @@ -36,7 +36,7 @@ Summary: High Availability cluster command-line interface License: GPL-2.0+ Group: %{pkg_group} -Version: 4.0.0+git.1510233955.43c72bf7 +Version: 4.0.0+git.1510563824.1aecfa01 Release: 0 Url: http://crmsh.github.io Source0: %{name}-%{version}.tar.bz2 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.2e6zUC/_old 2017-11-13 14:07:56.405820843 +0100 +++ /var/tmp/diff_new_pack.2e6zUC/_new 2017-11-13 14:07:56.405820843 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/crmsh.git</param> - <param name="changesrevision">43c72bf7f33b941ba68e41d612741591e0d7fa92</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">1aecfa01858a5a8edc303d9897a651eeaec23d80</param></service></servicedata> \ No newline at end of file ++++++ crmsh-4.0.0+git.1510233955.43c72bf7.tar.bz2 -> crmsh-4.0.0+git.1510563824.1aecfa01.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1510233955.43c72bf7/crmsh/bootstrap.py new/crmsh-4.0.0+git.1510563824.1aecfa01/crmsh/bootstrap.py --- old/crmsh-4.0.0+git.1510233955.43c72bf7/crmsh/bootstrap.py 2017-11-09 14:25:55.000000000 +0100 +++ new/crmsh-4.0.0+git.1510563824.1aecfa01/crmsh/bootstrap.py 2017-11-13 10:03:44.000000000 +0100 @@ -495,22 +495,21 @@ error("Failed to restart firewall (SuSEfirewall2)") def init_firewall_firewalld(tcp, udp): - if not service_is_active("firewalld"): - warn("Unable to configure firewall: Not active") - return + has_firewalld = service_is_active("firewalld") + cmdbase = 'firewall-cmd --zone=public --permanent ' if has_firewalld else 'firewall-offline-cmd --zone=public ' + + def cmd(args): + if not invoke(cmdbase + args): + error("Failed to configure firewall.") + for p in tcp: - if not invoke("firewall-cmd --zone=public --add-port={}/tcp --permanent".format(p)): - error("Failed to configure firewall (firewalld via firewall-cmd)") + cmd("--add-port={}/tcp".format(p)) for p in udp: - if not invoke("firewall-cmd --zone=public --add-port={}/udp --permanent".format(p)): - error("Failed to configure firewall (firewalld via firewall-cmd)") - - if not service_is_active("firewalld"): - return + cmd("--add-port={}/udp".format(p)) - if not invoke("firewall-cmd --reload"): - warn("Failed to reload firewall configuration (firewalld via firewall-cmd)") + if has_firewalld: + cmd("--reload") def init_firewall_ufw(tcp, udp): """ @@ -1546,9 +1545,13 @@ def join_ssh_merge(_cluster_node): status("Merging known_hosts") - hosts = [m.group(1) for m in re.finditer(r"^\s*host\s*([^ ;]+)\s*;", open(CSYNC2_CFG).read(), re.M)] + me = utils.this_node() + hosts = [m.group(1) + for m in re.finditer(r"^\s*host\s*([^ ;]+)\s*;", open(CSYNC2_CFG).read(), re.M) + if m.group(1) != me] if not hosts: - error("Unable to extract host list from %s" % (CSYNC2_CFG)) + hosts = [_cluster_node] + warn("Unable to extract host list from %s" % (CSYNC2_CFG)) try: import parallax diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1510233955.43c72bf7/crmsh/config.py new/crmsh-4.0.0+git.1510563824.1aecfa01/crmsh/config.py --- old/crmsh-4.0.0+git.1510233955.43c72bf7/crmsh/config.py 2017-11-09 14:25:55.000000000 +0100 +++ new/crmsh-4.0.0+git.1510563824.1aecfa01/crmsh/config.py 2017-11-13 10:03:44.000000000 +0100 @@ -260,7 +260,7 @@ 'from_time': opt_string('-12H'), 'compress': opt_boolean('yes'), 'speed_up': opt_boolean('no'), - 'collect_extra_logs': opt_string('/var/log/messages /var/log/pacemaker.log'), + 'collect_extra_logs': opt_string('/var/log/messages /var/log/pacemaker.log /var/log/ha-cluster-bootstrap.log'), 'remove_exist_dest': opt_boolean('no'), 'single_node': opt_boolean('no') } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1510233955.43c72bf7/hb_report/utillib.py new/crmsh-4.0.0+git.1510563824.1aecfa01/hb_report/utillib.py --- old/crmsh-4.0.0+git.1510233955.43c72bf7/hb_report/utillib.py 2017-11-09 14:25:55.000000000 +0100 +++ new/crmsh-4.0.0+git.1510563824.1aecfa01/hb_report/utillib.py 2017-11-13 10:03:44.000000000 +0100 @@ -835,10 +835,11 @@ def get_conf_var(option, default=None): ret = default - with open(constants.CONF, 'r') as f: - for line in f.read().split('\n'): - if re.match("^\s*%s\s*:" % option, line): - ret = line.split(':')[1].lstrip() + if os.path.isfile(constants.CONF): + with open(constants.CONF, 'r') as f: + for line in f.read().split('\n'): + if re.match("^\s*%s\s*:" % option, line): + ret = line.split(':')[1].lstrip() return ret @@ -1128,15 +1129,16 @@ def is_conf_set(option, subsys=None): subsys_start = 0 - with open(constants.CONF, 'r') as f: - for line in f.read().split('\n'): - if re.search("^\s*subsys\s*:\s*%s$" % subsys, line): - subsys_start = 1 - if subsys_start == 1 and re.search("^\s*}", line): - subsys_start = 0 - if re.match("^\s*%s\s*:\s*(on|yes)$" % option, line): - if not subsys or subsys_start == 1: - return True + if os.path.isfile(constants.CONF): + with open(constants.CONF, 'r') as f: + for line in f.read().split('\n'): + if re.search("^\s*subsys\s*:\s*%s$" % subsys, line): + subsys_start = 1 + if subsys_start == 1 and re.search("^\s*}", line): + subsys_start = 0 + if re.match("^\s*%s\s*:\s*(on|yes)$" % option, line): + if not subsys or subsys_start == 1: + return True return False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1510233955.43c72bf7/test/run-in-container.sh new/crmsh-4.0.0+git.1510563824.1aecfa01/test/run-in-container.sh --- old/crmsh-4.0.0+git.1510233955.43c72bf7/test/run-in-container.sh 2017-11-09 14:25:55.000000000 +0100 +++ new/crmsh-4.0.0+git.1510563824.1aecfa01/test/run-in-container.sh 2017-11-13 10:03:44.000000000 +0100 @@ -7,12 +7,28 @@ cat /etc/group | awk '{ FS = ":" } { print $3 }' | grep -q $ogid || groupadd -g $ogid id -u $oname >/dev/null 2>&1 || useradd -u $ouid -g $ogid $oname -echo "** Unit tests" -su $oname -c "./test/run" -echo "** Autogen / Configure" -su $oname -c "./autogen.sh" -su $oname -c "./configure --prefix /usr" -echo "** Make / Install" -make install -echo "** Regression tests" -sh /usr/share/crmsh/tests/regression.sh +unit_tests() { + echo "** Unit tests" + su $oname -c "./test/run" +} + +configure() { + echo "** Autogen / Configure" + su $oname -c "./autogen.sh" + su $oname -c "./configure --prefix /usr" +} + +make_install() { + echo "** Make / Install" + make install +} + +regression_tests() { + echo "** Regression tests" + sh /usr/share/crmsh/tests/regression.sh +} + +unit_tests +configure +make_install +regression_tests diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1510233955.43c72bf7/utils/crm_clean.py new/crmsh-4.0.0+git.1510563824.1aecfa01/utils/crm_clean.py --- old/crmsh-4.0.0+git.1510233955.43c72bf7/utils/crm_clean.py 2017-11-09 14:25:55.000000000 +0100 +++ new/crmsh-4.0.0+git.1510563824.1aecfa01/utils/crm_clean.py 2017-11-13 10:03:44.000000000 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/python3 import os import sys import shutil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.0.0+git.1510233955.43c72bf7/utils/crm_pkg.py new/crmsh-4.0.0+git.1510563824.1aecfa01/utils/crm_pkg.py --- old/crmsh-4.0.0+git.1510233955.43c72bf7/utils/crm_pkg.py 2017-11-09 14:25:55.000000000 +0100 +++ new/crmsh-4.0.0+git.1510563824.1aecfa01/utils/crm_pkg.py 2017-11-13 10:03:44.000000000 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # Copyright (C) 2013 Kristoffer Gronlund <kgronl...@suse.com> # See COPYING for license information.