Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2020-03-19 19:49:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "crmsh" Thu Mar 19 19:49:02 2020 rev:178 rq:786479 version:4.2.0+git.1584623405.d39158a2 Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-03-17 13:09:29.813769092 +0100 +++ /work/SRC/openSUSE:Factory/.crmsh.new.3160/crmsh.changes 2020-03-19 19:52:30.408260566 +0100 @@ -1,0 +2,12 @@ +Thu Mar 19 13:19:38 UTC 2020 - [email protected] + +- Update to version 4.2.0+git.1584623405.d39158a2: + * Fix: bootstrap: Change condition to add stonith-sbd resource(bsc#1166967) + +------------------------------------------------------------------- +Wed Mar 18 10:53:30 UTC 2020 - [email protected] + +- Update to version 4.2.0+git.1584528254.371d05b1: + * Dev: bootstrap: binding interface when calling "crm cluster init" + +------------------------------------------------------------------- Old: ---- crmsh-4.2.0+git.1584360067.097e3790.tar.bz2 New: ---- crmsh-4.2.0+git.1584623405.d39158a2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.1XL8u2/_old 2020-03-19 19:52:31.864261406 +0100 +++ /var/tmp/diff_new_pack.1XL8u2/_new 2020-03-19 19:52:31.884261418 +0100 @@ -36,7 +36,7 @@ Summary: High Availability cluster command-line interface License: GPL-2.0-or-later Group: %{pkg_group} -Version: 4.2.0+git.1584360067.097e3790 +Version: 4.2.0+git.1584623405.d39158a2 Release: 0 Url: http://crmsh.github.io Source0: %{name}-%{version}.tar.bz2 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.1XL8u2/_old 2020-03-19 19:52:31.956261460 +0100 +++ /var/tmp/diff_new_pack.1XL8u2/_new 2020-03-19 19:52:31.956261460 +0100 @@ -5,4 +5,4 @@ <param name="url">https://github.com/liangxin1300/crmsh.git</param> <param name="changesrevision">d8dc51b4cb34964aa72e918999ebc7f03b48f3c9</param></service><service name="tar_scm"> <param name="url">https://github.com/ClusterLabs/crmsh.git</param> - <param name="changesrevision">2c10d3df8de68a2df4e2f3ada933528ddba22b1e</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">669f13b518847287d9994e8f3a00ffd876b376df</param></service></servicedata> \ No newline at end of file ++++++ crmsh-4.2.0+git.1584360067.097e3790.tar.bz2 -> crmsh-4.2.0+git.1584623405.d39158a2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-4.2.0+git.1584360067.097e3790/crmsh/bootstrap.py new/crmsh-4.2.0+git.1584623405.d39158a2/crmsh/bootstrap.py --- old/crmsh-4.2.0+git.1584360067.097e3790/crmsh/bootstrap.py 2020-03-16 13:01:07.000000000 +0100 +++ new/crmsh-4.2.0+git.1584623405.d39158a2/crmsh/bootstrap.py 2020-03-19 14:10:05.000000000 +0100 @@ -660,7 +660,7 @@ # for cluster join, diskless_sbd flag is set in join_cluster() if # sbd is running on seed host - if configured_sbd_device() or _context.diskless_sbd: + if (configured_sbd_device() and _context.sbd_device) or _context.diskless_sbd: invoke("systemctl enable sbd.service") else: invoke("systemctl disable sbd.service") @@ -1496,7 +1496,7 @@ rsc_defaults rsc-options: resource-stickiness=1 migration-threshold=3 """) - if configured_sbd_device(): + if configured_sbd_device() and _context.sbd_device: if not invoke("crm configure primitive stonith-sbd stonith:external/sbd pcmk_delay_max=30s"): error("Can't create stonith-sbd primitive") if not invoke("crm configure property stonith-enabled=true"): @@ -1702,8 +1702,8 @@ # authorized_keys file (again, to help with the case where the # user has done manual initial setup without the assistance of # ha-cluster-init). - if not invoke("ssh root@%s crm cluster init ssh_remote" % (seed_host)): - error("Can't invoke crm cluster init ssh_remote on %s" % (seed_host)) + if not invoke("ssh root@{} crm cluster init -i {} ssh_remote".format(seed_host, _context.nic)): + error("Can't invoke crm cluster init -i {} ssh_remote on {}".format(_context.nic, seed_host)) def join_csync2(seed_host): @@ -1724,8 +1724,8 @@ # If we *were* updating /etc/hosts, the next line would have "\"$hosts_line\"" as # the last arg (but this requires re-enabling this functionality in ha-cluster-init) - if not invoke("ssh -o StrictHostKeyChecking=no root@{} crm cluster init csync2_remote {}".format(seed_host, utils.this_node())): - error("Can't invoke crm cluster init init csync2_remote on {}".format(seed_host)) + if not invoke("ssh -o StrictHostKeyChecking=no root@{} crm cluster init -i {} csync2_remote {}".format(seed_host, _context.nic, utils.this_node())): + error("Can't invoke crm cluster init -i {} init csync2_remote on {}".format(_context.nic, seed_host)) # This is necessary if syncing /etc/hosts (to ensure everyone's got the # same list of hosts)
