Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-cluster -> sle12 ## BNC# 879596 : "[Test Case 1394899] Upgrade SLE 11 HA to SLE 12 HA" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-cluster/yast2-cluster.changes 2014-05-30 12:17:16.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-cluster/yast2-cluster.changes 2014-05-30 15:42:52.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 30 13:39:43 UTC 2014 - nwang@suse.com + +- BNC#879596. Detect corosync.conf format. Notice user when using + old format configuration. +- Version 3.1.8 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-cluster ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-cluster (Old) and /mounts/work_src_done/SLE12/yast2-cluster (BS:build ID:38757 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-cluster", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-cluster-3.1.7.tar.bz2 New: ---- yast2-cluster-3.1.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-cluster.spec ++++++ --- /var/tmp/diff_new_pack.5EibJP/_old 2014-05-30 17:00:20.000000000 +0200 +++ /var/tmp/diff_new_pack.5EibJP/_new 2014-05-30 17:00:20.000000000 +0200 @@ -18,7 +18,7 @@ Name: yast2-cluster %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services -Version: 3.1.7 +Version: 3.1.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-cluster-3.1.7.tar.bz2 -> yast2-cluster-3.1.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-3.1.7/package/yast2-cluster.changes new/yast2-cluster-3.1.8/package/yast2-cluster.changes --- old/yast2-cluster-3.1.7/package/yast2-cluster.changes 2014-05-30 10:15:18.000000000 +0200 +++ new/yast2-cluster-3.1.8/package/yast2-cluster.changes 2014-05-30 15:40:16.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri May 30 13:39:43 UTC 2014 - nwang@suse.com + +- BNC#879596. Detect corosync.conf format. Notice user when using + old format configuration. +- Version 3.1.8 + +------------------------------------------------------------------- Fri May 30 06:12:00 UTC 2014 - nwang@suse.com - BNC#880491. Check nodeid behavior when auto node id is disabled. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-3.1.7/package/yast2-cluster.spec new/yast2-cluster-3.1.8/package/yast2-cluster.spec --- old/yast2-cluster-3.1.7/package/yast2-cluster.spec 2014-05-30 10:15:18.000000000 +0200 +++ new/yast2-cluster-3.1.8/package/yast2-cluster.spec 2014-05-30 15:40:16.000000000 +0200 @@ -18,7 +18,7 @@ Name: yast2-cluster %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services -Version: 3.1.7 +Version: 3.1.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-3.1.7/src/include/cluster/dialogs.rb new/yast2-cluster-3.1.8/src/include/cluster/dialogs.rb --- old/yast2-cluster-3.1.7/src/include/cluster/dialogs.rb 2014-05-30 10:15:18.000000000 +0200 +++ new/yast2-cluster-3.1.8/src/include/cluster/dialogs.rb 2014-05-30 15:40:16.000000000 +0200 @@ -531,6 +531,12 @@ UI.ChangeWidget(Id(:rrpmode), :Enabled, true) end + # BNC#879596, check the corosync.conf format + if Cluster.config_format == "old" + Popup.Message(" NOTICE: Detected old corosync configuration.\n Please reconfigure the member list and confirm all other settings.") + Cluster.config_format = "showed" + end + transport_switch nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-3.1.7/src/modules/Cluster.rb new/yast2-cluster-3.1.8/src/modules/Cluster.rb --- old/yast2-cluster-3.1.7/src/modules/Cluster.rb 2014-05-30 10:15:18.000000000 +0200 +++ new/yast2-cluster-3.1.8/src/modules/Cluster.rb 2014-05-30 15:40:16.000000000 +0200 @@ -69,6 +69,7 @@ @threads = "" @cluster_name = "" @expected_votes = "" + @config_format = "" @bindnetaddr1 = "" @mcastaddr1 = "" @@ -165,6 +166,7 @@ @expected_votes = SCR.Read(path(".openais.quorum.expected_votes")).to_s + @config_format = SCR.Read(path(".openais.totem.interface.member.memberaddr")).to_s @transport = SCR.Read(path(".openais.totem.transport")) @transport = "udp" if @transport == nil @@ -735,6 +737,7 @@ publish :variable => :mcastaddr1, :type => "string" publish :variable => :cluster_name, :type => "string" publish :variable => :expected_votes, :type => "string" + publish :variable => :config_format, :type => "string" publish :variable => :mcastport1, :type => "string" publish :variable => :enable2, :type => "boolean" publish :variable => :bindnetaddr2, :type => "string" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-3.1.7/src/servers_non_y2/ag_openais new/yast2-cluster-3.1.8/src/servers_non_y2/ag_openais --- old/yast2-cluster-3.1.7/src/servers_non_y2/ag_openais 2014-05-30 10:15:18.000000000 +0200 +++ new/yast2-cluster-3.1.8/src/servers_non_y2/ag_openais 2014-05-30 15:40:16.000000000 +0200 @@ -130,6 +130,11 @@ "nodeid":{"doc":"required in ipv6, optional in ipv4","type":"string"}, } +#BNC-879596. Obsolete, just use to detect the file format is SLE11SP3 or SLE12 +old_memberlist_table = { + "memberaddr":{"doc":"obsolete! Only use to detect old(SLE11SP3) format.", "type":"string", "default_value":"0"}, +} + logging_option_table = { "debug":{"doc":"Whether or not turning on the debug information in the log", "default_value":"off", "suggested_value":"off"}, @@ -266,7 +271,7 @@ for inf in totem_options["interface"]: f.write("\tinterface {\n") for k in inf.keys(): - if inf[k] == "": + if inf[k] == "" or k == "oldlist": continue; else: f.write("\t\t#%s\n" % (interface_option_table[k]["doc"])) @@ -335,6 +340,10 @@ members = result.get("node", []) members.append(opt_parser(file, node_option_table)) result["node"] = members + elif i.lstrip().split(" ")[0] == "member": + oldmembers = result.get("oldlist", []) + oldmembers.append(opt_parser(file, old_memberlist_table)) + result["oldlist"] = oldmembers else: #y2warning("Unknown sub-directive %s found. Ignore it" % (i.lstrip().split(" ")[0])) while (i[-1] != "}"): @@ -423,6 +432,13 @@ del totem_options["interface"][i] break +# obsolete setting. BNC-879596, pop up a message if config file is in old format. +def check_conf_format(): + for x in range(len(totem_options["interface"])): + if totem_options["interface"][x].has_key("oldlist"): + return "old" + return "new" + def load_ais_conf(filename): try: f = open(filename, "r") @@ -543,6 +559,8 @@ return '"%d"' % i.get("mcastport", 5405) else: return "nil" + elif path[2] == "member": + return '"%s"' % check_conf_format() else: return "nil" else: continue with "q"... Checked in at Fri May 30 17:00:59 CEST 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org