Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2015-10-22 12:59:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crmsh" Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2015-10-20 00:05:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2015-10-22 12:59:28.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Oct 20 11:14:01 UTC 2015 - kgronlund@suse.com + +- Update to version 2.2.0~rc3+git.1445338389.7433378: + + high: scripts: Fix DRBD script resource reference (bsc#951028) + + low: constants: Tweaked graph colors + +------------------------------------------------------------------- Old: ---- crmsh-2.2.0~rc3+git.1444854254.fc37f7f.tar.bz2 New: ---- crmsh-2.2.0~rc3+git.1445338389.7433378.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.talPCG/_old 2015-10-22 12:59:28.000000000 +0200 +++ /var/tmp/diff_new_pack.talPCG/_new 2015-10-22 12:59:28.000000000 +0200 @@ -36,7 +36,7 @@ Summary: High Availability cluster command-line interface License: GPL-2.0+ Group: %{pkg_group} -Version: 2.2.0~rc3+git.1444854254.fc37f7f +Version: 2.2.0~rc3+git.1445338389.7433378 Release: 0 Url: http://crmsh.github.io Source0: %{name}-%{version}.tar.bz2 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.talPCG/_old 2015-10-22 12:59:28.000000000 +0200 +++ /var/tmp/diff_new_pack.talPCG/_new 2015-10-22 12:59:28.000000000 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/crmsh.git</param> - <param name="changesrevision">fc37f7f872a065147e3c0c32e962a924cad109b3</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">7433378e1abf96bf84b4af781cec9ab16f6ed5f5</param></service></servicedata> \ No newline at end of file ++++++ crmsh-2.2.0~rc3+git.1444854254.fc37f7f.tar.bz2 -> crmsh-2.2.0~rc3+git.1445338389.7433378.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/cibconfig.py new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/cibconfig.py --- old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/cibconfig.py 2015-10-15 07:18:06.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/cibconfig.py 2015-10-20 13:14:01.000000000 +0200 @@ -2169,7 +2169,6 @@ rc = False return rc - def apply(self, factory, mode='cli', no_remove=False, method='replace'): rc = True @@ -2691,9 +2690,10 @@ def find_objects(self, obj_id): "Find objects for id (can be a wildcard-glob)." + def matchfn(x): + return x and fnmatch.fnmatch(x, obj_id) if not self.is_cib_sane() or obj_id is None: return None - matchfn = lambda x: x and fnmatch.fnmatch(x, obj_id) objs = [] for obj in self.cib_objects: if matchfn(obj.obj_id): @@ -3690,9 +3690,7 @@ erase_ok = True l = [] rscstat = RscState() - for obj in [obj for obj in self.cib_objects - if not obj.children and not is_constraint(obj.node) - and obj.obj_type != "node"]: + for obj in [obj for obj in self.cib_objects if not obj.children and not is_constraint(obj.node) and obj.obj_type != "node"]: if not rscstat.can_delete(obj.obj_id): common_warn("resource %s is running, can't delete it" % obj.obj_id) erase_ok = False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/cliformat.py new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/cliformat.py --- old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/cliformat.py 2015-10-15 07:18:06.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/cliformat.py 2015-10-20 13:14:01.000000000 +0200 @@ -386,8 +386,8 @@ def cli_acl_permission(node): s = [clidisplay.keyword(node.get('kind'))] - #if node.get('id'): - # s.append(head_id_format(node.get('id'))) + # if node.get('id'): + # s.append(head_id_format(node.get('id'))) if node.get('description'): s.append(nvpair_format('description', node.get('description'))) for attrname, cliname in constants.acl_spec_map_2_rev: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/cmd_status.py new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/cmd_status.py --- old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/cmd_status.py 2015-10-15 07:18:06.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/cmd_status.py 2015-10-20 13:14:01.000000000 +0200 @@ -36,8 +36,7 @@ 'unknown', 'Unknown', 'OFFLINE', - 'Failed actions' -] + 'Failed actions'] class CrmMonFilter(object): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/constants.py new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/constants.py --- old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/constants.py 2015-10-15 07:18:06.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/constants.py 2015-10-20 13:14:01.000000000 +0200 @@ -259,16 +259,18 @@ "node": { "style": "bold", "shape": "box", - "color": "blue", + "color": "#7ac142", }, "primitive": { - "fillcolor": "lightgrey", + "fillcolor": "#e4e5e6", + "color": "#b9b9b9", "style": "filled", }, "rsc_template": { - "fillcolor": "lightgrey", - "color": "mediumpurple", + "fillcolor": "#e4e5e6", + "color": "#b9b9b9", "style": "filled", + "shape": "invhouse", }, "class:stonith": { "shape": "box", @@ -279,14 +281,14 @@ "dir": "none", }, "clone": { - "color": "red", + "color": "#ec008c", }, "ms": { - "color": "maroon", + "color": "#f8981d", }, "group": { - "color": "blue", - "group": "blue", + "color": "#00aeef", + "group": "#00aeef", "labelloc": "b", "labeljust": "r", "labelfontsize": "12", @@ -295,7 +297,7 @@ "style": "dotted", }, "template:edge": { - "color": "grey64", + "color": "#b9b9b9", "style": "dotted", "arrowtail": "open", "dir": "back", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/crm_pssh.py new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/crm_pssh.py --- old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/crm_pssh.py 2015-10-15 07:18:06.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/crm_pssh.py 2015-10-20 13:14:01.000000000 +0200 @@ -127,7 +127,7 @@ show_output(opts.errdir, hosts, "stderr") return False # The any builtin was introduced in Python 2.5 (so we can't use it yet): - #elif any(x==255 for x in statuses): + # elif any(x==255 for x in statuses): for status in statuses: if status == 255: common_warn("ssh processes failed") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/log_patterns.py new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/log_patterns.py --- old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/log_patterns.py 2015-10-15 07:18:06.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/log_patterns.py 2015-10-20 13:14:01.000000000 +0200 @@ -21,58 +21,58 @@ # [Note that resources may contain clone numbers!] log_patterns = { - "resource": ( - ( # detail 0 - "lrmd.*%% (?:start|stop|promote|demote|migrate)", - "lrmd.*RA output: .%%:.*:stderr", - "lrmd.*WARN: Managed %%:.*exited", - "lrmd.*WARN: .* %% .*timed out$", - "crmd.*LRM operation %%_(?:start|stop|promote|demote|migrate)_.*confirmed=true", - "crmd.*LRM operation %%_.*Timed Out", - "[(]%%[)][[]", - ), - ( # detail 1 - "lrmd.*%% (?:probe|notify)", - "lrmd.*Managed %%:.*exited", - ), - ), - "node": ( - ( # detail 0 - " %% .*Corosync.Cluster.Engine", - " %% .*Executive.Service.RELEASE", - " %% .*Requesting.shutdown", - " %% .*Shutdown.complete", - " %% .*Configuration.validated..Starting.heartbeat", - "pengine.*Scheduling Node %% for STONITH", - "crmd.* of %% failed", - "stonith-ng.*host '%%'", - "Exec.*on %% ", - "Node %% will be fenced", - "stonith-ng.*for %% timed", - "stonith-ng.*can not fence %%:", - "stonithd.*Succeeded.*node %%:", - "(?:lost|memb): %% ", - "crmd.*(?:NEW|LOST):.* %% ", - "Node return implies stonith of %% ", - ), - ( # detail 1 - ), - ), - "quorum": ( - ( # detail 0 - "crmd.*Updating.quorum.status", - "crmd.*quorum.(?:lost|ac?quir)", - ), - ( # detail 1 - ), - ), - "events": ( - ( # detail 0 - "CRIT:", - "ERROR:", - ), - ( # detail 1 - "WARN:", - ), - ), + "resource": ( + ( # detail 0 + "lrmd.*%% (?:start|stop|promote|demote|migrate)", + "lrmd.*RA output: .%%:.*:stderr", + "lrmd.*WARN: Managed %%:.*exited", + "lrmd.*WARN: .* %% .*timed out$", + "crmd.*LRM operation %%_(?:start|stop|promote|demote|migrate)_.*confirmed=true", + "crmd.*LRM operation %%_.*Timed Out", + "[(]%%[)][[]", + ), + ( # detail 1 + "lrmd.*%% (?:probe|notify)", + "lrmd.*Managed %%:.*exited", + ), + ), + "node": ( + ( # detail 0 + " %% .*Corosync.Cluster.Engine", + " %% .*Executive.Service.RELEASE", + " %% .*Requesting.shutdown", + " %% .*Shutdown.complete", + " %% .*Configuration.validated..Starting.heartbeat", + "pengine.*Scheduling Node %% for STONITH", + "crmd.* of %% failed", + "stonith-ng.*host '%%'", + "Exec.*on %% ", + "Node %% will be fenced", + "stonith-ng.*for %% timed", + "stonith-ng.*can not fence %%:", + "stonithd.*Succeeded.*node %%:", + "(?:lost|memb): %% ", + "crmd.*(?:NEW|LOST):.* %% ", + "Node return implies stonith of %% ", + ), + ( # detail 1 + ), + ), + "quorum": ( + ( # detail 0 + "crmd.*Updating.quorum.status", + "crmd.*quorum.(?:lost|ac?quir)", + ), + ( # detail 1 + ), + ), + "events": ( + ( # detail 0 + "CRIT:", + "ERROR:", + ), + ( # detail 1 + "WARN:", + ), + ), } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/log_patterns_118.py new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/log_patterns_118.py --- old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/log_patterns_118.py 2015-10-15 07:18:06.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/log_patterns_118.py 2015-10-20 13:14:01.000000000 +0200 @@ -21,56 +21,56 @@ # [Note that resources may contain clone numbers!] log_patterns = { - "resource": ( - ( # detail 0 - "crmd.*Initiating.*%%_(?:start|stop|promote|demote|migrate)_", - "lrmd.*operation_finished: %%_", - "crmd.*LRM operation %%_(?:start|stop|promote|demote|migrate)_.*confirmed=true", - "crmd.*LRM operation %%_.*Timed Out", - "[(]%%[)][[]", - ), - ( # detail 1 - "crmd.*Initiating%%_(?:monitor_0|notify)", - ), - ), - "node": ( - ( # detail 0 - " %% .*Corosync.Cluster.Engine", - " %% .*Executive.Service.RELEASE", - " %% .*crm_shutdown:.Requesting.shutdown", - " %% .*pcmk_shutdown:.Shutdown.complete", - " %% .*Configuration.validated..Starting.heartbeat", - "pengine.*Scheduling Node %% for STONITH", - "pengine.*Node %% will be fenced", - "crmd.*for %% failed", - "stonith-ng.*host '%%'", - "Exec.*on %% ", - "Node %% will be fenced", - "stonith-ng.*on %% for.*timed out", - "stonith-ng.*can not fence %%:", - "stonithd.*Succeeded.*node %%:", - "(?:lost|memb): %% ", - "crmd.*(?:NEW|LOST):.* %% ", - "Node return implies stonith of %% ", - ), - ( # detail 1 - ), - ), - "quorum": ( - ( # detail 0 - "crmd.*Updating.quorum.status", - "crmd.*quorum.(?:lost|ac?quir)", - ), - ( # detail 1 - ), - ), - "events": ( - ( # detail 0 - "(?:CRIT|crit):", - "(?:ERROR|error):", - ), - ( # detail 1 - "(?:WARN|warning):", - ), - ), + "resource": ( + ( # detail 0 + "crmd.*Initiating.*%%_(?:start|stop|promote|demote|migrate)_", + "lrmd.*operation_finished: %%_", + "crmd.*LRM operation %%_(?:start|stop|promote|demote|migrate)_.*confirmed=true", + "crmd.*LRM operation %%_.*Timed Out", + "[(]%%[)][[]", + ), + ( # detail 1 + "crmd.*Initiating%%_(?:monitor_0|notify)", + ), + ), + "node": ( + ( # detail 0 + " %% .*Corosync.Cluster.Engine", + " %% .*Executive.Service.RELEASE", + " %% .*crm_shutdown:.Requesting.shutdown", + " %% .*pcmk_shutdown:.Shutdown.complete", + " %% .*Configuration.validated..Starting.heartbeat", + "pengine.*Scheduling Node %% for STONITH", + "pengine.*Node %% will be fenced", + "crmd.*for %% failed", + "stonith-ng.*host '%%'", + "Exec.*on %% ", + "Node %% will be fenced", + "stonith-ng.*on %% for.*timed out", + "stonith-ng.*can not fence %%:", + "stonithd.*Succeeded.*node %%:", + "(?:lost|memb): %% ", + "crmd.*(?:NEW|LOST):.* %% ", + "Node return implies stonith of %% ", + ), + ( # detail 1 + ), + ), + "quorum": ( + ( # detail 0 + "crmd.*Updating.quorum.status", + "crmd.*quorum.(?:lost|ac?quir)", + ), + ( # detail 1 + ), + ), + "events": ( + ( # detail 0 + "(?:CRIT|crit):", + "(?:ERROR|error):", + ), + ( # detail 1 + "(?:WARN|warning):", + ), + ), } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/pacemaker.py new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/pacemaker.py --- old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/pacemaker.py 2015-10-15 07:18:06.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/pacemaker.py 2015-10-20 13:14:01.000000000 +0200 @@ -124,11 +124,6 @@ except etree.Error, msg: raise PacemakerError("Failed to parse the Relax-NG schema: " + str(msg)) - #try: - # schema.assertValid(cib_elem) - #except etree.DocumentInvalid, err_msg: - # print err_msg - # print schema.error_log try: etree.clear_error_log() except: @@ -330,9 +325,6 @@ attr_values = [] sub_rng_nodes = self.sorted_sub_rng_nodes_by_node(*attr_rng_node[0]) for sub_rng_node in sub_rng_nodes.get("value", []): - #print etree.tostring(sub_rng_node[0][1]) - #print sub_rng_node[0][1].text - #attr_values.append(sub_rng_node[0][1].getchildren()[0].data) attr_values.append(sub_rng_node[0][1].text) return attr_values @@ -361,7 +353,6 @@ if selected.count(name): continue # the complicated case: 'choice' - #if self.find_decl(sub_rng_node, "choice") != 0: optional = any(self.find_decl(node, opt) != 0 for opt in ("optional", "zeroOrMore")) if subset_select(sub_set, optional): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/ra.py new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/ra.py --- old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/ra.py 2015-10-15 07:18:06.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/ra.py 2015-10-20 13:14:01.000000000 +0200 @@ -147,11 +147,7 @@ Get information from crm_resource. ''' rc, l = stdout2list("crm_resource %s" % opts, stderr_on=False) - # not clear when/why crm_resource exits with non-zero - # code - #if rc != 0: - # common_debug("crm_resource %s exited with code %d" % - # (opts, rc)) + # TODO: check rc return l def meta(self, ra_class, ra_type, ra_provider): @@ -476,8 +472,7 @@ return None return [c.get("name") for c in self.ra_elem.xpath("//parameters/parameter") - if c.get("name") - and c.get("name") not in self.excluded_from_completion] + if c.get("name") and c.get("name") not in self.excluded_from_completion] def actions(self): ''' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/report.py new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/report.py --- old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/modules/report.py 2015-10-15 07:18:06.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1445338389.7433378/modules/report.py 2015-10-20 13:14:01.000000000 +0200 @@ -1548,10 +1548,8 @@ return False self.show_logs(log_l=l) - pe_details_header = \ - "Date Start End Filename Client User Origin" - pe_details_separator = \ - "==== ===== === ======== ====== ==== ======" + pe_details_header = "Date Start End Filename Client User Origin" + pe_details_separator = "==== ===== === ======== ====== ==== ======" def pe_detail_format(self, t_obj): l = [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/scripts/drbd/main.yml new/crmsh-2.2.0~rc3+git.1445338389.7433378/scripts/drbd/main.yml --- old/crmsh-2.2.0~rc3+git.1444854254.fc37f7f/scripts/drbd/main.yml 2015-10-15 07:18:06.000000000 +0200 +++ new/crmsh-2.2.0~rc3+git.1445338389.7433378/scripts/drbd/main.yml 2015-10-20 13:14:01.000000000 +0200 @@ -9,11 +9,12 @@ parameters: - name: id - shortdesc: DRBD Cluster Resource ID. + shortdesc: DRBD Cluster Resource ID required: true value: drbd-data type: resource - name: drbd_resource + shortdesc: DRBD Resource Name required: true value: drbd0 type: string @@ -29,5 +30,5 @@ drbdconf="{{drbdconf}}" op monitor interval="29s" role="Master" op monitor interval="31s" role="Slave" - ms ms-{{drbd:id}} {{drbd:id}} + ms ms-{{id}} {{id}} meta master-max=1 master-node-max=1 clone-max=2 clone-node-max=1 notify=true