commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2020-04-08 19:57:16 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new.3248 (New) Package is "ha-cluster-bootstrap" Wed Apr 8 19:57:16 2020 rev:36 rq:792481 version:0.5 Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2019-08-22 10:52:51.601695959 +0200 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new.3248/ha-cluster-bootstrap.changes 2020-04-08 19:57:40.417166785 +0200 @@ -1,0 +2,5 @@ +Wed Apr 8 08:33:33 UTC 2020 - XinLiang + +- update init man page since qdevice option changed + +--- Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.XWMFgr/_old 2020-04-08 19:57:42.329168182 +0200 +++ /var/tmp/diff_new_pack.XWMFgr/_new 2020-04-08 19:57:42.333168185 +0200 @@ -1,7 +1,7 @@ # # spec file for package ha-cluster-bootstrap # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2010-2011 Novell Inc. All Rights Reserved. # # All modifications and additions to the file contributed by third parties @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -21,9 +21,9 @@ Version:0.5 Release:0 Summary:Pacemaker HA Cluster Bootstrap Tool -License:GPL-2.0 +License:GPL-2.0-only Group: Productivity/Clustering/HA -Url:https://github.com/tserong/sleha-bootstrap +URL:https://github.com/tserong/sleha-bootstrap Source: sleha-bootstrap-%{version}.tar.bz2 BuildRequires: crmsh >= 3
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2019-08-22 10:52:48 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new.22127 (New) Package is "ha-cluster-bootstrap" Thu Aug 22 10:52:48 2019 rev:35 rq:724853 version:0.5 Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2017-11-30 12:44:56.658893941 +0100 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new.22127/ha-cluster-bootstrap.changes 2019-08-22 10:52:51.601695959 +0200 @@ -1,0 +2,5 @@ +Wed Aug 14 17:52:10 UTC 2019 - xli...@suse.com + +- use help2man to generate init/join/remove man page (bsc#1138353) + +--- Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.qDIvXM/_old 2019-08-22 10:52:52.093695893 +0200 +++ /var/tmp/diff_new_pack.qDIvXM/_new 2019-08-22 10:52:52.093695893 +0200 @@ -1,7 +1,7 @@ # # spec file for package ha-cluster-bootstrap # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010-2011 Novell Inc. All Rights Reserved. # # All modifications and additions to the file contributed by third parties @@ -79,6 +79,9 @@ mkhelp() { help2man -s 8 -n "$1" -o %{buildroot}%{_mandir}/man8/ha-cluster-$2.8 --version-string "%{version}" --help-option "cluster $2 --help" /usr/sbin/crm } +mkhelp "Initialize cluster" init +mkhelp "Join cluster" join +mkhelp "Remove node from cluster" remove mkhelp "Initialize as geo cluster" geo-init mkhelp "Join geo cluster" geo-join mkhelp "Initialize as geo arbitrator" geo-init-arbitrator
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2017-11-30 12:44:55 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Thu Nov 30 12:44:55 2017 rev:34 rq:546236 version:0.5 Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2017-09-04 12:32:02.767589704 +0200 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2017-11-30 12:44:56.658893941 +0100 @@ -1,0 +2,5 @@ +Tue Nov 28 14:11:14 UTC 2017 - kgronl...@suse.com + +- Switch to Python 3 (bsc#1070140) + +--- Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.J2ZfNP/_old 2017-11-30 12:44:57.218873584 +0100 +++ /var/tmp/diff_new_pack.J2ZfNP/_new 2017-11-30 12:44:57.218873584 +0100 @@ -28,7 +28,11 @@ BuildRequires: crmsh >= 3 BuildRequires: help2man -BuildRequires: python2-parallax +%if 0%{?suse_version} > 1320 +BuildRequires: python3-parallax +%else +BuildRequires: python-parallax +%endif Requires: crmsh >= 3 Requires: ha-cluster-webui Requires: iproute2
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2017-09-04 12:32:02 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Mon Sep 4 12:32:02 2017 rev:33 rq:519890 version:0.5 Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2017-02-20 13:14:10.428229171 +0100 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2017-09-04 12:32:02.767589704 +0200 @@ -1,0 +2,5 @@ +Tue Jul 25 13:31:00 UTC 2017 - kgronl...@suse.com + +- Recommend sbd, resource-agents and fence-agents (bsc#1050427) + +--- Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.haKeba/_old 2017-09-04 12:32:03.651465431 +0200 +++ /var/tmp/diff_new_pack.haKeba/_new 2017-09-04 12:32:03.655464868 +0200 @@ -28,6 +28,7 @@ BuildRequires: crmsh >= 3 BuildRequires: help2man +BuildRequires: python2-parallax Requires: crmsh >= 3 Requires: ha-cluster-webui Requires: iproute2 @@ -35,6 +36,9 @@ Requires: util-linux Recommends: hawk2 Recommends: ocfs2-tools +Recommends: sbd +Recommends: resource-agents +Recommends: fence-agents # These three are required for ocfs2 setup, but not generic setup Recommends: parted BuildRoot: %{_tmppath}/%{name}-%{version}-build
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2017-02-20 13:14:09 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2017-01-10 10:44:12.313236728 +0100 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2017-02-20 13:14:10.428229171 +0100 @@ -1,0 +2,9 @@ +Tue Jan 31 15:49:17 UTC 2017 - kgronl...@suse.com + +- Update to version 0.5: + * Clarify crmsh version that has bootstrap commands + * Include sleha- aliases for commands (bnc#862798) + +- Remove 0004-Warn-if-using-the-old-sleha-command-form-bnc-862798.patch + +--- @@ -227,0 +237,3 @@ + +- Add symlinks to sleha-* commands; warn of obsolescence if used (bnc#862798) + + Added warn-if-using-obsolete-sleha-command.patch Old: sleha-bootstrap-0.4+git.1481877541.6b06de6.tar.bz2 New: sleha-bootstrap-0.5.tar.bz2 Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.ywp6EM/_old 2017-02-20 13:14:10.904162260 +0100 +++ /var/tmp/diff_new_pack.ywp6EM/_new 2017-02-20 13:14:10.908161698 +0100 @@ -1,7 +1,7 @@ # # spec file for package ha-cluster-bootstrap # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010-2011 Novell Inc. All Rights Reserved. # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: ha-cluster-bootstrap -Version:0.4+git.1481877541.6b06de6 +Version:0.5 Release:0 Summary:Pacemaker HA Cluster Bootstrap Tool License:GPL-2.0 @@ -26,13 +26,12 @@ Url:https://github.com/tserong/sleha-bootstrap Source: sleha-bootstrap-%{version}.tar.bz2 -BuildRequires: crmsh >= 2.3.2+git.1481875498 +BuildRequires: crmsh >= 3 BuildRequires: help2man -Requires: crmsh >= 2.3.2+git.1481875498 +Requires: crmsh >= 3 Requires: ha-cluster-webui Requires: iproute2 Requires: pacemaker -Requires: pssh Requires: util-linux Recommends: hawk2 Recommends: ocfs2-tools @@ -63,6 +62,12 @@ install -p -m 644 man/ha-cluster-join.8 %{buildroot}%{_mandir}/man8 install -p -m 644 man/ha-cluster-remove.8 %{buildroot}%{_mandir}/man8 +%if !0%{?is_opensuse} +ln -s ha-cluster-init %{buildroot}%{_sbindir}/sleha-init +ln -s ha-cluster-join %{buildroot}%{_sbindir}/sleha-join +ln -s ha-cluster-remove %{buildroot}%{_sbindir}/sleha-remove +%endif + mkhelp() { help2man -s 8 -n "$1" -o %{buildroot}%{_mandir}/man8/ha-cluster-$2.8 --version-string "%{version}" --help-option "cluster $2 --help" /usr/sbin/crm } @@ -72,6 +77,11 @@ %files %defattr(-,root,root) +%if !0%{?is_opensuse} +%{_sbindir}/sleha-init +%{_sbindir}/sleha-join +%{_sbindir}/sleha-remove +%endif %{_sbindir}/ha-cluster-init %{_sbindir}/ha-cluster-join %{_sbindir}/ha-cluster-remove ++ _service ++ --- /var/tmp/diff_new_pack.ywp6EM/_old 2017-02-20 13:14:10.952155513 +0100 +++ /var/tmp/diff_new_pack.ywp6EM/_new 2017-02-20 13:14:10.956154950 +0100 @@ -1,10 +1,10 @@ -git://github.com/krig/sleha-bootstrap.git +git://github.com/tserong/sleha-bootstrap.git git .git -0.4+git.%ct.%h -crmsh-bootstrap +0.5 +0.5 enable ++ _servicedata ++ --- /var/tmp/diff_new_pack.ywp6EM/_old 2017-02-20 13:14:10.992149890 +0100 +++ /var/tmp/diff_new_pack.ywp6EM/_new 2017-02-20 13:14:10.992149890 +0100 @@ -1,6 +1,4 @@ git://github.com/tserong/sleha-bootstrap.git - 4584e871492e8152bd745b00903d652c33cb727e -git://github.com/krig/sleha-bootstrap.git - 6b06de692cc25e55b98e5b1b8caff9cc3c5fa01c \ No newline at end of file + b57ea2432ece9072cce04dccd7b1f75b3d8a2a9a \ No newline at end of file ++ sleha-bootstrap-0.4+git.1481877541.6b06de6.tar.bz2 -> sleha-bootstrap-0.5.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1481877541.6b06de6/README new/sleha-bootstrap-0.5/README --- old/sleha-bootstrap-0.4+git.1481877541.6b06de6/README 2016-12-16 09:39:01.0 +0100 +++ new/sleha-bootstrap-0.5/README 2017-01-31 16:44:30.0 +0100 @@ -1,9 +1,11 @@ HA Cluster Bootstrap -NOTE: The actual implementation of these tools has moved to crmsh: +NOTE: The actual implemen
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2016-10-10 16:21:05 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2016-07-24 19:53:38.0 +0200 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2016-10-10 16:21:06.0 +0200 @@ -1,0 +2,6 @@ +Thu Oct 06 07:40:14 UTC 2016 - kgronl...@suse.com + +- Update to version 0.4+git.1475739556.1088521: + * Better corosync defaults (bsc#1001164) + +--- Old: sleha-bootstrap-0.4+git.1469191369.b497afa.tar.bz2 New: sleha-bootstrap-0.4+git.1475739556.1088521.tar.bz2 Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.5MdYZ9/_old 2016-10-10 16:21:09.0 +0200 +++ /var/tmp/diff_new_pack.5MdYZ9/_new 2016-10-10 16:21:09.0 +0200 @@ -18,7 +18,7 @@ Name: ha-cluster-bootstrap -Version:0.4+git.1469191369.b497afa +Version:0.4+git.1475739556.1088521 Release:0 Summary:Pacemaker HA Cluster Bootstrap Tool License:GPL-2.0 ++ _servicedata ++ --- /var/tmp/diff_new_pack.5MdYZ9/_old 2016-10-10 16:21:09.0 +0200 +++ /var/tmp/diff_new_pack.5MdYZ9/_new 2016-10-10 16:21:09.0 +0200 @@ -1,4 +1,4 @@ git://github.com/tserong/sleha-bootstrap.git - b497afa7d6339ddc13dff9b43a4b1cb50d47b78f \ No newline at end of file + 4584e871492e8152bd745b00903d652c33cb727e \ No newline at end of file ++ sleha-bootstrap-0.4+git.1469191369.b497afa.tar.bz2 -> sleha-bootstrap-0.4+git.1475739556.1088521.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1469191369.b497afa/scripts/ha-cluster-functions new/sleha-bootstrap-0.4+git.1475739556.1088521/scripts/ha-cluster-functions --- old/sleha-bootstrap-0.4+git.1469191369.b497afa/scripts/ha-cluster-functions 2016-07-22 14:43:33.0 +0200 +++ new/sleha-bootstrap-0.4+git.1475739556.1088521/scripts/ha-cluster-functions 2016-10-06 09:39:16.0 +0200 @@ -29,6 +29,7 @@ declare -r LOG_FILE=/var/log/ha-cluster-bootstrap.log declare -r CSYNC2_KEY=/etc/csync2/key_hagroup declare -r CSYNC2_CFG=/etc/csync2/csync2.cfg +declare -r COROSYNC_AUTH=/etc/corosync/authkey declare -r COROSYNC_CONF=/etc/corosync/corosync.conf declare -r SYSCONFIG_SBD=/etc/sysconfig/sbd declare -r SYSCONFIG_FW=/etc/sysconfig/SuSEfirewall2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1469191369.b497afa/scripts/ha-cluster-init new/sleha-bootstrap-0.4+git.1475739556.1088521/scripts/ha-cluster-init --- old/sleha-bootstrap-0.4+git.1469191369.b497afa/scripts/ha-cluster-init 2016-07-22 14:43:33.0 +0200 +++ new/sleha-bootstrap-0.4+git.1475739556.1088521/scripts/ha-cluster-init 2016-10-06 09:39:16.0 +0200 @@ -243,14 +243,18 @@ totem { version:2 - - crypto_cipher: none - crypto_hash:none - - secauth:off + secauth:on + crypto_hash:sha1 + crypto_cipher: aes256 cluster_name: hacluster clear_node_high_bit: yes + token: 5000 + token_retransmits_before_loss_const: 10 + join: 60 + consensus: 6000 + max_messages: 20 + interface { ringnumber: 0 bindnetaddr:$bindnetaddr @@ -334,21 +338,17 @@ totem { version:2 - secauth:off + secauth:on + crypto_hash:sha1 + crypto_cipher: aes256 cluster_name: hacluster clear_node_high_bit: yes -# Following are old corosync 1.4.x defaults from SLES -# token: 5000 -# token_retransmits_before_loss_const: 10 -# join: 60 -# consensus: 6000 -# vsftype:none -# max_messages: 20 -# threads:0 - - crypto_cipher: none - crypto_hash:none + token: 5000 + token_retransmits_before_loss_const: 10 + join: 60 + consensus: 6000 + max_messages: 20 interface { ringnumber: 0 @@ -385,8 +385,21 @@ invoke csync2 -xv $COROSYNC_CONF } +init_corosync_auth() +{ + # generate the corosync authkey + if [ -f "$COROSYNC
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2016-07-24 19:53:15 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2016-06-14 23:06:51.0 +0200 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2016-07-24 19:53:38.0 +0200 @@ -1,0 +2,13 @@ +Fri Jul 22 12:43:33 UTC 2016 - kgronl...@suse.com + +- Update to version 0.4+git.1469191369.b497afa: + * Set pcmk_delay_max=30s for SBD resource (bsc#988356) (bsc#990213) + +--- +Fri Jul 22 09:07:13 UTC 2016 - kgronl...@suse.com + +- Update to version 0.4+git.1469178371.e8b668d: + * Reload corosync configuration if unicast (bsc#989809) + * Use ip route to find iface name over netstat which is deprecated + +--- Old: sleha-bootstrap-0.4+git.1464165931.150e061.tar.bz2 New: sleha-bootstrap-0.4+git.1469191369.b497afa.tar.bz2 Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.ykPFgd/_old 2016-07-24 19:53:39.0 +0200 +++ /var/tmp/diff_new_pack.ykPFgd/_new 2016-07-24 19:53:39.0 +0200 @@ -18,7 +18,7 @@ Name: ha-cluster-bootstrap -Version:0.4+git.1464165931.150e061 +Version:0.4+git.1469191369.b497afa Release:0 Summary:Pacemaker HA Cluster Bootstrap Tool License:GPL-2.0 ++ _servicedata ++ --- /var/tmp/diff_new_pack.ykPFgd/_old 2016-07-24 19:53:39.0 +0200 +++ /var/tmp/diff_new_pack.ykPFgd/_new 2016-07-24 19:53:39.0 +0200 @@ -1,4 +1,4 @@ git://github.com/tserong/sleha-bootstrap.git - 150e0614205a431ff0bae056a0776f7593f48296 \ No newline at end of file + b497afa7d6339ddc13dff9b43a4b1cb50d47b78f \ No newline at end of file ++ sleha-bootstrap-0.4+git.1464165931.150e061.tar.bz2 -> sleha-bootstrap-0.4+git.1469191369.b497afa.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1464165931.150e061/scripts/ha-cluster-functions new/sleha-bootstrap-0.4+git.1469191369.b497afa/scripts/ha-cluster-functions --- old/sleha-bootstrap-0.4+git.1464165931.150e061/scripts/ha-cluster-functions 2016-05-25 10:47:19.0 +0200 +++ new/sleha-bootstrap-0.4+git.1469191369.b497afa/scripts/ha-cluster-functions 2016-07-22 14:43:33.0 +0200 @@ -36,7 +36,7 @@ declare BE_QUIET=false declare YES_TO_ALL=false -declare NET_IF="$(netstat -nr | grep '^0.0.0.0' | awk '{print ($(NF))}' 2>/dev/null)" +declare NET_IF="$(ip -o route show default | awk '/default/ {print $5}' 2>/dev/null)" declare IP_ADDRESS declare IP_NETWORK @@ -168,7 +168,7 @@ if ! grep -q '^FW_CONFIGURATIONS_EXT=.*cluster' $SYSCONFIG_FW ; then tmp_conf=${SYSCONFIG_FW}.$$ sed \ - -e 's/^\(FW_CONFIGURATIONS_EXT="\)\(.*\)/\1cluster \2/' \ + -e 's/^\(FW_CONFIGURATIONS_EXT=\"\)\(.*\)/\1cluster \2/' \ $SYSCONFIG_FW > $tmp_conf install_tmp $tmp_conf $SYSCONFIG_FW fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1464165931.150e061/scripts/ha-cluster-init new/sleha-bootstrap-0.4+git.1469191369.b497afa/scripts/ha-cluster-init --- old/sleha-bootstrap-0.4+git.1464165931.150e061/scripts/ha-cluster-init 2016-05-25 10:47:19.0 +0200 +++ new/sleha-bootstrap-0.4+git.1469191369.b497afa/scripts/ha-cluster-init 2016-07-22 14:43:33.0 +0200 @@ -621,7 +621,7 @@ # stonith-enabled, or it wipes out then entire # cib-bootstrap-options section # TODO: find out if this is a bug in the crm shell - invoke crm configure primitive stonith-sbd stonith:external/sbd \ + invoke crm configure primitive stonith-sbd stonith:external/sbd params pcmk_delay_max=30s \ || error "Can't create stonith-sbd primitive" invoke crm configure property stonith-enabled="true" \ || error "Can't enable STONITH" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1464165931.150e061/scripts/ha-cluster-join new/
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2016-06-14 23:06:49 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2016-03-07 13:24:47.0 +0100 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2016-06-14 23:06:51.0 +0200 @@ -1,0 +2,6 @@ +Wed May 25 08:47:19 UTC 2016 - kgronl...@suse.com + +- Update to version 0.4+git.1464165931.150e061: + + Don't configure no-quorum-policy=ignore, ever (bsc#981056) + +--- Old: sleha-bootstrap-0.4+git.1456303675.b6eb2b3.tar.bz2 New: sleha-bootstrap-0.4+git.1464165931.150e061.tar.bz2 Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.OJpc2A/_old 2016-06-14 23:06:52.0 +0200 +++ /var/tmp/diff_new_pack.OJpc2A/_new 2016-06-14 23:06:52.0 +0200 @@ -18,7 +18,7 @@ Name: ha-cluster-bootstrap -Version:0.4+git.1456303675.b6eb2b3 +Version:0.4+git.1464165931.150e061 Release:0 Summary:Pacemaker HA Cluster Bootstrap Tool License:GPL-2.0 ++ _servicedata ++ --- /var/tmp/diff_new_pack.OJpc2A/_old 2016-06-14 23:06:52.0 +0200 +++ /var/tmp/diff_new_pack.OJpc2A/_new 2016-06-14 23:06:52.0 +0200 @@ -1,4 +1,4 @@ git://github.com/tserong/sleha-bootstrap.git - b6eb2b33223d3ef313a0dc4c96e267e229834e85 \ No newline at end of file + 150e0614205a431ff0bae056a0776f7593f48296 \ No newline at end of file ++ sleha-bootstrap-0.4+git.1456303675.b6eb2b3.tar.bz2 -> sleha-bootstrap-0.4+git.1464165931.150e061.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1456303675.b6eb2b3/scripts/ha-cluster-init new/sleha-bootstrap-0.4+git.1464165931.150e061/scripts/ha-cluster-init --- old/sleha-bootstrap-0.4+git.1456303675.b6eb2b3/scripts/ha-cluster-init 2016-02-24 09:49:46.0 +0100 +++ new/sleha-bootstrap-0.4+git.1464165931.150e061/scripts/ha-cluster-init 2016-05-25 10:47:19.0 +0200 @@ -602,7 +602,6 @@ cat > $tmp_conf <
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2016-03-07 13:24:11 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2015-11-02 12:55:21.0 +0100 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2016-03-07 13:24:47.0 +0100 @@ -1,0 +2,6 @@ +Wed Feb 24 08:49:46 UTC 2016 - kgronl...@suse.com + +- Update to version 0.4+git.1456303675.b6eb2b3: + + Corosync UDPU support (fate#320604) (fate#320605) + +--- Old: sleha-bootstrap-0.4+git.1441350120.8e9abbe.tar.bz2 New: sleha-bootstrap-0.4+git.1456303675.b6eb2b3.tar.bz2 Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.1YiZ3l/_old 2016-03-07 13:24:48.0 +0100 +++ /var/tmp/diff_new_pack.1YiZ3l/_new 2016-03-07 13:24:48.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package ha-cluster-bootstrap # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010-2011 Novell Inc. All Rights Reserved. # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: ha-cluster-bootstrap -Version:0.4+git.1441350120.8e9abbe +Version:0.4+git.1456303675.b6eb2b3 Release:0 Summary:Pacemaker HA Cluster Bootstrap Tool License:GPL-2.0 ++ _servicedata ++ --- /var/tmp/diff_new_pack.1YiZ3l/_old 2016-03-07 13:24:48.0 +0100 +++ /var/tmp/diff_new_pack.1YiZ3l/_new 2016-03-07 13:24:48.0 +0100 @@ -1,4 +1,4 @@ git://github.com/tserong/sleha-bootstrap.git - 8e9abbe8c603cda068aadbb949ebde7996e512c4 \ No newline at end of file + b6eb2b33223d3ef313a0dc4c96e267e229834e85 \ No newline at end of file ++ sleha-bootstrap-0.4+git.1441350120.8e9abbe.tar.bz2 -> sleha-bootstrap-0.4+git.1456303675.b6eb2b3.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1441350120.8e9abbe/scripts/ha-cluster-init new/sleha-bootstrap-0.4+git.1456303675.b6eb2b3/scripts/ha-cluster-init --- old/sleha-bootstrap-0.4+git.1441350120.8e9abbe/scripts/ha-cluster-init 2015-09-04 11:32:37.0 +0200 +++ new/sleha-bootstrap-0.4+git.1456303675.b6eb2b3/scripts/ha-cluster-init 2016-02-24 09:49:46.0 +0100 @@ -31,6 +31,7 @@ declare OCFS2_DEVICE declare TEMPLATE declare ADMIN_IP +declare COROSYNC_UNICAST=false usage() { @@ -49,6 +50,11 @@ -tOptionally configure cluster with template 'name' (currently only "ocfs2" is valid here) +Options for corosync: +-u Configure corosync to communicate over unicast (UDP), +and not multicast. Default is multicast unless an +environment where multicast cannot be used is detected. + Options for ocfs2 template: -p Partition this shared storage device (only used in "storage" stage) @@ -202,7 +208,92 @@ fi } -init_corosync() +init_corosync_unicast() +{ + if $YES_TO_ALL; then + status 'Configuring corosync (unicast)' + else + status " +Configure Corosync (unicast): + This will configure the cluster messaging layer. You will need + to specify a network address over which to communicate (default + is ${NET_IF}'s network, but you can use the network address of any + active interface). +" + fi + + if [ -f "$COROSYNC_CONF" ]; then + confirm \ + "$COROSYNC_CONF already exists - overwrite?" || return + fi + + local bindnetaddr=$(prompt_for_string \ + 'Network address to bind to (e.g.: 192.168.1.0)' \ + '([0-9]+\.){3}[0-9]+' "$IP_NETWORK") + [ -z "$bindnetaddr" ] && error 'No value for bindnetaddr' + + local mcastport=$(prompt_for_string \ + 'Port' \ + '[0-9]+' 5405); + [ -z "$mcastport" ] && error 'No value for mcastport' + + local tmp_conf=${COROSYNC_CONF}.$$ + cat > $tmp_conf < $tmp_conf -# else -# # Fallback to known sane config (defaults from SLE HA 11 SP1 -# # corosync.conf.example.patch) - cat > $tmp_conf < $tmp_conf <'; then + init_corosync_unicast + elif $COROSYNC_UNICAST; then +
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2015-11-02 12:55:17 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2015-10-30 21:53:06.0 +0100 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2015-11-02 12:55:21.0 +0100 @@ -1,0 +2,5 @@ +Sat Oct 31 16:50:46 UTC 2015 - kgronl...@suse.com + +- Add recommends for hawk2 (bsc#952982) + +--- Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.8x3Xmb/_old 2015-11-02 12:55:22.0 +0100 +++ /var/tmp/diff_new_pack.8x3Xmb/_new 2015-11-02 12:55:22.0 +0100 @@ -32,6 +32,7 @@ Requires: pacemaker Requires: pssh Requires: util-linux +Recommends: hawk2 Recommends: ocfs2-tools # These three are required for ocfs2 setup, but not generic setup Recommends: parted
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2015-10-30 21:53:04 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2015-09-09 20:21:24.0 +0200 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2015-10-30 21:53:06.0 +0100 @@ -1,0 +2,5 @@ +Fri Oct 30 14:42:53 UTC 2015 - kgronl...@suse.com + +- Drop recommends for hawk (bsc#952428) + +--- Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.xdlQFQ/_old 2015-10-30 21:53:07.0 +0100 +++ /var/tmp/diff_new_pack.xdlQFQ/_new 2015-10-30 21:53:07.0 +0100 @@ -32,7 +32,6 @@ Requires: pacemaker Requires: pssh Requires: util-linux -Recommends: hawk Recommends: ocfs2-tools # These three are required for ocfs2 setup, but not generic setup Recommends: parted
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2015-09-09 20:21:22 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2015-08-29 20:05:10.0 +0200 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2015-09-09 20:21:24.0 +0200 @@ -1,0 +2,11 @@ +Fri Sep 04 09:32:37 UTC 2015 - kgronl...@suse.com + +- Update to version 0.4+git.1441350120.8e9abbe: + + Sync entire /etc/booth directory (fate#319318) + + Check corosync.conf before access (bsc#943227) + + Use update over replace to avoid deleting DC attributes (bsc#890802) + + Update README with a bit more detail + +- Remove 0001-sync-entire-booth-directory-fate-319318.patch + +--- Old: 0001-sync-entire-booth-directory-fate-319318.patch sleha-bootstrap-0.4+git.1440306826.cf7cfcf.tar.bz2 New: sleha-bootstrap-0.4+git.1441350120.8e9abbe.tar.bz2 Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.P86RFd/_old 2015-09-09 20:21:24.0 +0200 +++ /var/tmp/diff_new_pack.P86RFd/_new 2015-09-09 20:21:24.0 +0200 @@ -18,7 +18,7 @@ Name: ha-cluster-bootstrap -Version:0.4+git.1440306826.cf7cfcf +Version:0.4+git.1441350120.8e9abbe Release:0 Summary:Pacemaker HA Cluster Bootstrap Tool License:GPL-2.0 @@ -26,9 +26,6 @@ Url:https://github.com/tserong/sleha-bootstrap Source: sleha-bootstrap-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM: Sync entire /etc/booth directory (fate#319318) -Patch1: 0001-sync-entire-booth-directory-fate-319318.patch - Requires: csync2 Requires: ha-cluster-webui Requires: iproute2 @@ -47,7 +44,6 @@ %prep %setup -n sleha-bootstrap-%{version} -%patch1 -p1 %build %install ++ _servicedata ++ --- /var/tmp/diff_new_pack.P86RFd/_old 2015-09-09 20:21:24.0 +0200 +++ /var/tmp/diff_new_pack.P86RFd/_new 2015-09-09 20:21:24.0 +0200 @@ -1,4 +1,4 @@ git://github.com/tserong/sleha-bootstrap.git - cf7cfcf11507bf64493a83ab6c25e1843d7a3717 \ No newline at end of file + 8e9abbe8c603cda068aadbb949ebde7996e512c4 \ No newline at end of file ++ sleha-bootstrap-0.4+git.1440306826.cf7cfcf.tar.bz2 -> sleha-bootstrap-0.4+git.1441350120.8e9abbe.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1440306826.cf7cfcf/README new/sleha-bootstrap-0.4+git.1441350120.8e9abbe/README --- old/sleha-bootstrap-0.4+git.1440306826.cf7cfcf/README 2015-08-28 12:25:54.0 +0200 +++ new/sleha-bootstrap-0.4+git.1441350120.8e9abbe/README 2015-09-04 11:32:37.0 +0200 @@ -1,3 +1,17 @@ HA Cluster Bootstrap + -Tool to bootstrap a Pacemaker High Availability cluster in a hurry. +Tools to bootstrap a Pacemaker High Availability cluster in a hurry. + +* ha-cluster-init + Installs and configures the first node in a new cluster. + +* ha-cluster-join + Installs and configures new nodes to join the cluster. + +* ha-cluster-remove + Removes a node from the cluster. + +NOTE: This tool is most likely to work best on a SUSE-based +distribution (SLE or openSUSE). Patches to make it cross- +platform compatible are welcomed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1440306826.cf7cfcf/scripts/ha-cluster-init new/sleha-bootstrap-0.4+git.1441350120.8e9abbe/scripts/ha-cluster-init --- old/sleha-bootstrap-0.4+git.1440306826.cf7cfcf/scripts/ha-cluster-init 2015-08-28 12:25:54.0 +0200 +++ new/sleha-bootstrap-0.4+git.1441350120.8e9abbe/scripts/ha-cluster-init 2015-09-04 11:32:37.0 +0200 @@ -137,7 +137,7 @@ { key /etc/csync2/key_hagroup; host $(hostname); - include /etc/booth/booth.conf; + include /etc/booth; include /etc/corosync/corosync.conf; include /etc/corosync/authkey; include /etc/csync2/csync2.cfg; @@ -522,7 +522,7 @@ resource-stickiness="1" \\ migration-threshold="3" END - crm_configure_load replace $tmp_conf + crm_configure_load update $tmp_conf # sbd fencing if applicable (getting local sbd_device here direct # from SBD config, in case init_cluster is invoked on its own) diff -urN '--exclude=CVS'
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2015-08-29 20:05:07 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2015-08-07 00:23:51.0 +0200 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2015-08-29 20:05:10.0 +0200 @@ -1,0 +2,18 @@ +Fri Aug 28 10:25:54 UTC 2015 - kgronl...@suse.com + +- Update to version 0.4+git.1440306826.cf7cfcf: + - Patches are now merged upstream + - Remove 0001-Only-check-for-pseudy-tty-if-in-interactive-mode-bnc.patch + - Remove 0002-Add-administration-Virtual-IP-fate-318549.patch + - Remove 0003-Only-check-watchdog-if-potentially-using-SBD.patch + - Remove 0004-Remove-admin-IP-suggestion-as-it-is-confusing-bsc-93.patch + +- Sync entire /etc/booth directory (fate#319318) +- Add 0001-sync-entire-booth-directory-fate-319318.patch + +--- +Mon Aug 24 07:18:08 UTC 2015 - kgronl...@suse.com + +- Require ha-cluster-webui instead of hawk (bsc#942723) + +--- Old: 0001-Only-check-for-pseudy-tty-if-in-interactive-mode-bnc.patch 0002-Add-administration-Virtual-IP-fate-318549.patch 0003-Only-check-watchdog-if-potentially-using-SBD.patch 0004-Remove-admin-IP-suggestion-as-it-is-confusing-bsc-93.patch sleha-bootstrap-0.4+git.1430918556.6f42311.tar.bz2 New: 0001-sync-entire-booth-directory-fate-319318.patch sleha-bootstrap-0.4+git.1440306826.cf7cfcf.tar.bz2 Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.B3dTOb/_old 2015-08-29 20:05:11.0 +0200 +++ /var/tmp/diff_new_pack.B3dTOb/_new 2015-08-29 20:05:11.0 +0200 @@ -18,28 +18,24 @@ Name: ha-cluster-bootstrap -Version:0.4+git.1430918556.6f42311 +Version:0.4+git.1440306826.cf7cfcf Release:0 Summary:Pacemaker HA Cluster Bootstrap Tool License:GPL-2.0 Group: Productivity/Clustering/HA Url:https://github.com/tserong/sleha-bootstrap Source: sleha-bootstrap-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM: Only check for pseudo-tty if in interactive mode (bnc#892702) -Patch1: 0001-Only-check-for-pseudy-tty-if-in-interactive-mode-bnc.patch -# PATCH-FEATURE-UPSTREAM: Add administration Virtual IP (fate#318549) -Patch2: 0002-Add-administration-Virtual-IP-fate-318549.patch -# PATCH-FIX-UPSTREAM: Only check watchdog if potentially using SBD -Patch3: 0003-Only-check-watchdog-if-potentially-using-SBD.patch -# PATCH-FIX-UPSTREAM: Remove admin IP suggestion as it is confusing (bsc#939351) -Patch4: 0004-Remove-admin-IP-suggestion-as-it-is-confusing-bsc-93.patch + +# PATCH-FIX-UPSTREAM: Sync entire /etc/booth directory (fate#319318) +Patch1: 0001-sync-entire-booth-directory-fate-319318.patch Requires: csync2 -Requires: hawk +Requires: ha-cluster-webui Requires: iproute2 Requires: pacemaker Requires: pssh Requires: util-linux +Recommends: hawk Recommends: ocfs2-tools # These three are required for ocfs2 setup, but not generic setup Recommends: parted @@ -52,9 +48,6 @@ %prep %setup -n sleha-bootstrap-%{version} %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build %install ++ 0001-sync-entire-booth-directory-fate-319318.patch ++ commit 2aa8176cb02a36e924270f6c69fc8574bb643ee7 Author: Kristoffer Grönlund Date: Fri Aug 28 12:20:42 2015 +0200 Sync entire /etc/booth directory (fate#319318) Key files may be added in the /etc/booth directory, so we should sync all of the files there. diff --git a/scripts/ha-cluster-init b/scripts/ha-cluster-init index c983658..bc8abc9 100755 --- a/scripts/ha-cluster-init +++ b/scripts/ha-cluster-init @@ -137,7 +137,7 @@ group ha_group { key /etc/csync2/key_hagroup; host $(hostname); - include /etc/booth/booth.conf; + include /etc/booth; include /etc/corosync/corosync.conf; include /etc/corosync/authkey; include /etc/csync2/csync2.cfg; ++ _servicedata ++ --- /var/tmp/diff_new_pack.B3dTOb/_old 2015-08-29 20:05:11.0 +0200 +++ /var/tmp/diff_new_pack.B3dTOb/_new 2015-08-29 20:05:11.0 +0200 @@ -1,4 +1,4 @@ git://github.com/tserong/sleha-bootstrap.git - 6f423117528b0c730b17cbeec909caa7ed719f4a \ No newline at end of fil
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2015-08-07 00:23:50 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2015-05-22 09:53:29.0 +0200 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2015-08-07 00:23:51.0 +0200 @@ -1,0 +2,6 @@ +Mon Aug 3 13:10:19 UTC 2015 - kgronl...@suse.com + +- Remove admin IP suggestion as it is confusing (bsc#939351) +- Add 0004-Remove-admin-IP-suggestion-as-it-is-confusing-bsc-93.patch + +--- New: 0004-Remove-admin-IP-suggestion-as-it-is-confusing-bsc-93.patch Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.il6fbm/_old 2015-08-07 00:23:52.0 +0200 +++ /var/tmp/diff_new_pack.il6fbm/_new 2015-08-07 00:23:52.0 +0200 @@ -31,6 +31,8 @@ Patch2: 0002-Add-administration-Virtual-IP-fate-318549.patch # PATCH-FIX-UPSTREAM: Only check watchdog if potentially using SBD Patch3: 0003-Only-check-watchdog-if-potentially-using-SBD.patch +# PATCH-FIX-UPSTREAM: Remove admin IP suggestion as it is confusing (bsc#939351) +Patch4: 0004-Remove-admin-IP-suggestion-as-it-is-confusing-bsc-93.patch Requires: csync2 Requires: hawk @@ -52,6 +54,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %install ++ 0004-Remove-admin-IP-suggestion-as-it-is-confusing-bsc-93.patch ++ >From 09f54d9c58273f551f1d90eef0ca36174ed62b59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= Date: Mon, 3 Aug 2015 15:06:51 +0200 Subject: [PATCH] Remove admin IP suggestion as it is confusing (bsc#939351) --- scripts/ha-cluster-init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ha-cluster-init b/scripts/ha-cluster-init index e1cd774..c983658 100755 --- a/scripts/ha-cluster-init +++ b/scripts/ha-cluster-init @@ -619,7 +619,7 @@ Configure Administration IP Address: fi adminaddr=$(prompt_for_string \ - 'Administration Virtual IP (e.g.: 192.168.1.200)' \ + 'Administration Virtual IP' \ '([0-9]+\.){3}[0-9]+' "") [ -z "$adminaddr" ] && error 'No value for admin address' else -- 2.1.4
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2015-05-22 09:53:28 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2015-05-18 22:21:21.0 +0200 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2015-05-22 09:53:29.0 +0200 @@ -1,0 +2,10 @@ +Thu May 21 08:01:56 UTC 2015 - kgronl...@suse.com + +- Only check for pseudo-tty if in interactive mode (bnc#892702) +- Add administration Virtual IP (fate#318549) +- Only check watchdog if potentially using SBD +- Add 0001-Only-check-for-pseudy-tty-if-in-interactive-mode-bnc.patch +- Add 0002-Add-administration-Virtual-IP-fate-318549.patch +- Add 0003-Only-check-watchdog-if-potentially-using-SBD.patch + +--- New: 0001-Only-check-for-pseudy-tty-if-in-interactive-mode-bnc.patch 0002-Add-administration-Virtual-IP-fate-318549.patch 0003-Only-check-watchdog-if-potentially-using-SBD.patch Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.EHxm0y/_old 2015-05-22 09:53:30.0 +0200 +++ /var/tmp/diff_new_pack.EHxm0y/_new 2015-05-22 09:53:30.0 +0200 @@ -25,6 +25,12 @@ Group: Productivity/Clustering/HA Url:https://github.com/tserong/sleha-bootstrap Source: sleha-bootstrap-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM: Only check for pseudo-tty if in interactive mode (bnc#892702) +Patch1: 0001-Only-check-for-pseudy-tty-if-in-interactive-mode-bnc.patch +# PATCH-FEATURE-UPSTREAM: Add administration Virtual IP (fate#318549) +Patch2: 0002-Add-administration-Virtual-IP-fate-318549.patch +# PATCH-FIX-UPSTREAM: Only check watchdog if potentially using SBD +Patch3: 0003-Only-check-watchdog-if-potentially-using-SBD.patch Requires: csync2 Requires: hawk @@ -43,6 +49,9 @@ %prep %setup -n sleha-bootstrap-%{version} +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %install ++ 0001-Only-check-for-pseudy-tty-if-in-interactive-mode-bnc.patch ++ >From 57991c77157f7a2e9bc7e2211c69ef45cf2b70c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= Date: Thu, 21 May 2015 09:54:41 +0200 Subject: [PATCH 1/3] Only check for pseudy-tty if in interactive mode (bnc#892702) --- scripts/ha-cluster-functions | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/ha-cluster-functions b/scripts/ha-cluster-functions index d82290a..f8f2d42 100644 --- a/scripts/ha-cluster-functions +++ b/scripts/ha-cluster-functions @@ -472,6 +472,8 @@ check_prereqs() check_tty() { + $YES_TO_ALL && return 0 + # Check for pseudo-tty: Cannot display read prompts without a TTY (bnc#892702) if ! tty -s; then error "No pseudo-tty detected! Use -t option to ssh if calling remotely." -- 2.3.7 ++ 0002-Add-administration-Virtual-IP-fate-318549.patch ++ >From 6726b9eb9dac5cbe3382c76db76ece5825efbcc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= Date: Fri, 8 May 2015 18:26:22 +0200 Subject: [PATCH 2/3] Add administration Virtual IP (fate#318549) --- scripts/ha-cluster-init | 55 + 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/scripts/ha-cluster-init b/scripts/ha-cluster-init index ab2e582..a83abb3 100755 --- a/scripts/ha-cluster-init +++ b/scripts/ha-cluster-init @@ -30,6 +30,7 @@ declare SHARED_DEVICE declare SBD_DEVICE declare OCFS2_DEVICE declare TEMPLATE +declare ADMIN_IP usage() { @@ -53,6 +54,9 @@ Options for ocfs2 template: "storage" stage) -o Block device to use for OCFS2 (only used in "vgfs" stage) +Options for administration IP template: +-A IP address to use for the administration virtual IP + Stage can be one of: ssh Create SSH keys for passwordless SSH between cluster nodes csync2 Configure csync2 @@ -62,6 +66,7 @@ Stage can be one of: cluster Bring the cluster online vgfsCreate volume group and filesystem (ocfs2 template only, requires -o ) +admin Create administration virtual IP (optional) Note: - If stage is not specified, the script will run through each stage @@ -592,12 +597,52 @@ END wait_for_resource "Waiting for /srv/clusterfs to be mounted" clusterfs:0 } +init_admin() +{ + # Skip this section when -y is passed + # unless
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2015-05-18 22:21:20 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2015-05-06 07:48:39.0 +0200 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2015-05-18 22:21:21.0 +0200 @@ -1,0 +2,9 @@ +Fri May 08 16:29:54 UTC 2015 - kgronl...@suse.com + +- Update to version 0.4+git.1430918556.6f42311: + + Patches merged upstream + + Exit with error if ha-cluster-join is called over ssh without -t (bnc#892702) +- Remove 0001-Improved-IP-address-detection-algorithm-boo-920226.patch +- Remove 0002-Use-crm_node-to-count-nodes-in-cluster-when-deciding.patch + +--- Old: 0001-Improved-IP-address-detection-algorithm-boo-920226.patch 0002-Use-crm_node-to-count-nodes-in-cluster-when-deciding.patch sleha-bootstrap-0.4+git.1410854324.8459115.tar.bz2 New: _servicedata sleha-bootstrap-0.4+git.1430918556.6f42311.tar.bz2 Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.uzfh50/_old 2015-05-18 22:21:22.0 +0200 +++ /var/tmp/diff_new_pack.uzfh50/_new 2015-05-18 22:21:22.0 +0200 @@ -18,7 +18,7 @@ Name: ha-cluster-bootstrap -Version:0.4+git.1410854324.8459115 +Version:0.4+git.1430918556.6f42311 Release:0 Summary:Pacemaker HA Cluster Bootstrap Tool License:GPL-2.0 @@ -26,12 +26,6 @@ Url:https://github.com/tserong/sleha-bootstrap Source: sleha-bootstrap-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM: Improved IP address detection algorithm (boo#920226) -Patch1: 0001-Improved-IP-address-detection-algorithm-boo-920226.patch -# PATCH-FIX-UPSTREAM: Use crm_node to count nodes in cluster when deciding -# to reset no-quorum-policy=ignore (boo#923372) -Patch2: 0002-Use-crm_node-to-count-nodes-in-cluster-when-deciding.patch - Requires: csync2 Requires: hawk Requires: iproute2 @@ -49,8 +43,6 @@ %prep %setup -n sleha-bootstrap-%{version} -%patch1 -p1 -%patch2 -p1 %build %install ++ _service ++ --- /var/tmp/diff_new_pack.uzfh50/_old 2015-05-18 22:21:22.0 +0200 +++ /var/tmp/diff_new_pack.uzfh50/_new 2015-05-18 22:21:22.0 +0200 @@ -4,7 +4,8 @@ git .git 0.4+git.%ct.%h -8459115 +master +enable ++ _servicedata ++ git://github.com/tserong/sleha-bootstrap.git 6f423117528b0c730b17cbeec909caa7ed719f4a++ sleha-bootstrap-0.4+git.1410854324.8459115.tar.bz2 -> sleha-bootstrap-0.4+git.1430918556.6f42311.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1410854324.8459115/scripts/ha-cluster-functions new/sleha-bootstrap-0.4+git.1430918556.6f42311/scripts/ha-cluster-functions --- old/sleha-bootstrap-0.4+git.1410854324.8459115/scripts/ha-cluster-functions 2014-09-16 10:16:03.0 +0200 +++ new/sleha-bootstrap-0.4+git.1430918556.6f42311/scripts/ha-cluster-functions 2015-05-08 18:29:54.0 +0200 @@ -470,6 +470,14 @@ init_firewall } +check_tty() +{ + # Check for pseudo-tty: Cannot display read prompts without a TTY (bnc#892702) + if ! tty -s; then + error "No pseudo-tty detected! Use -t option to ssh if calling remotely." + fi +} + init() { log_start @@ -495,9 +503,7 @@ # up. If $IP_ADDRESS is overridden, network detect shouldn't work, # because "ip route" won't be able to help us. if [ -z "$IP_ADDRESS" ]; then - IP_ADDRESS=$(ip -o -f inet addr show primary | \ - awk "/[[:space:]]${NET_IF}[[:space:]]/ {print \$4} " | - sed 's/\/[0-9]\+//') + IP_ADDRESS=$(ip route get 1 oif $NET_IF | head -1 | awk '{print $NF}') fi if [ -z "$IP_NETWORK" -a -n "$IP_ADDRESS" ]; then IP_NETWORK=$(ip route list | \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1410854324.8459115/scripts/ha-cluster-init new/sleha-bootstrap-0.4+git.1430918556.6f42311/scripts/ha-cluster-init --- old/sleha-bootstrap-0.4+git.1410854324.8459115/scripts/ha-cluster-init 2014-09-16 10:16:03.0 +0200 +++ new/sleha-bootstrap-0.4+git.1430918556.6f4
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2015-05-06 07:48:38 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2014-09-17 17:26:37.0 +0200 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2015-05-06 07:48:39.0 +0200 @@ -1,0 +2,15 @@ +Tue Apr 21 11:10:39 UTC 2015 - kgronl...@suse.com + +- Updated IP address detection fix (boo#920226) + +--- +Tue Apr 21 05:59:07 UTC 2015 - kgronl...@suse.com + +- Improved IP address detection algorithm (boo#920226) +- Use crm_node to count nodes in cluster when deciding + to reset no-quorum-policy=ignore (boo#923372) +- Add 0001-Improved-IP-address-detection-algorithm-boo-920226.patch +- Add 0002-Use-crm_node-to-count-nodes-in-cluster-when-deciding.patch + + +--- New: 0001-Improved-IP-address-detection-algorithm-boo-920226.patch 0002-Use-crm_node-to-count-nodes-in-cluster-when-deciding.patch Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.0Cjkib/_old 2015-05-06 07:48:40.0 +0200 +++ /var/tmp/diff_new_pack.0Cjkib/_new 2015-05-06 07:48:40.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package ha-cluster-bootstrap # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010-2011 Novell Inc. All Rights Reserved. # # All modifications and additions to the file contributed by third parties @@ -26,6 +26,12 @@ Url:https://github.com/tserong/sleha-bootstrap Source: sleha-bootstrap-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM: Improved IP address detection algorithm (boo#920226) +Patch1: 0001-Improved-IP-address-detection-algorithm-boo-920226.patch +# PATCH-FIX-UPSTREAM: Use crm_node to count nodes in cluster when deciding +# to reset no-quorum-policy=ignore (boo#923372) +Patch2: 0002-Use-crm_node-to-count-nodes-in-cluster-when-deciding.patch + Requires: csync2 Requires: hawk Requires: iproute2 @@ -43,6 +49,8 @@ %prep %setup -n sleha-bootstrap-%{version} +%patch1 -p1 +%patch2 -p1 %build %install ++ 0001-Improved-IP-address-detection-algorithm-boo-920226.patch ++ >From 75cbe460fab9e17ab99427f072dbc01893016f60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= Date: Wed, 25 Mar 2015 20:47:08 +0100 Subject: [PATCH 1/2] Improved IP address detection algorithm (boo#920226) Use alternate IP address detection method which also works for peer-to-peer interfaces with a /32 netmask. Resolves: boo#920226 --- scripts/ha-cluster-functions | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/ha-cluster-functions b/scripts/ha-cluster-functions index 66e11ce..d82290a 100644 --- a/scripts/ha-cluster-functions +++ b/scripts/ha-cluster-functions @@ -503,9 +503,7 @@ init_network() # up. If $IP_ADDRESS is overridden, network detect shouldn't work, # because "ip route" won't be able to help us. if [ -z "$IP_ADDRESS" ]; then - IP_ADDRESS=$(ip -o -f inet addr show primary | \ - awk "/[[:space:]]${NET_IF}[[:space:]]/ {print \$4} " | - sed 's/\/[0-9]\+//') + IP_ADDRESS=$(ip route get 1 oif $NET_IF | head -1 | awk '{print $NF}') fi if [ -z "$IP_NETWORK" -a -n "$IP_ADDRESS" ]; then IP_NETWORK=$(ip route list | \ -- 2.1.4 ++ 0002-Use-crm_node-to-count-nodes-in-cluster-when-deciding.patch ++ >From 1362d3e60a2a890b519f13f55a4a7ecb7af2312b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= Date: Mon, 23 Mar 2015 09:54:27 +0100 Subject: [PATCH 2/2] Use crm_node to count nodes in cluster when deciding to reset no-quorum-policy=ignore (boo#923372) --- scripts/ha-cluster-join | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ha-cluster-join b/scripts/ha-cluster-join index 863c06c..eca2cf8 100755 --- a/scripts/ha-cluster-join +++ b/scripts/ha-cluster-join @@ -219,7 +219,7 @@ join_cluster() invoke corosync-cfgtool -R # Ditch no-quorum-policy=ignore if we're going over two nodes - if [ $new_quorum -gt 2 ] && crm configure show | grep -q 'no-quorum-policy=.*ignore' ; then + if [ $(crm_node -l | sed
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2014-09-17 17:26:14 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2014-09-03 19:57:34.0 +0200 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2014-09-17 17:26:37.0 +0200 @@ -1,0 +2,9 @@ +Tue Sep 16 08:16:23 UTC 2014 - kgronl...@suse.com + +- Silence grep when checking SBD config (bnc#895992) +- Drop merged patches: + + Remove 0001-sbd_init_with_new_style.patch + + Remove 0002-clean-up-multiline-warnings.patch +- Upstream version cs:8459115 + +--- Old: 0001-sbd_init_with_new_style.patch 0002-clean-up-multiline-warnings.patch sleha-bootstrap-0.4+git.1408418098.8d38b0b.tar.bz2 New: sleha-bootstrap-0.4+git.1410854324.8459115.tar.bz2 Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.TlEcTN/_old 2014-09-17 17:26:38.0 +0200 +++ /var/tmp/diff_new_pack.TlEcTN/_new 2014-09-17 17:26:38.0 +0200 @@ -18,17 +18,13 @@ Name: ha-cluster-bootstrap -Version:0.4+git.1408418098.8d38b0b +Version:0.4+git.1410854324.8459115 Release:0 Summary:Pacemaker HA Cluster Bootstrap Tool License:GPL-2.0 Group: Productivity/Clustering/HA Url:https://github.com/tserong/sleha-bootstrap Source: sleha-bootstrap-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM: Fix ha-cluster-init to init sbd configuration with new style (bnc#881484) -Patch6: 0001-sbd_init_with_new_style.patch -# PATCH-FIX-UPSTREAM: Clean up multiline warnings (bnc#885411) -Patch7: 0002-clean-up-multiline-warnings.patch Requires: csync2 Requires: hawk @@ -47,8 +43,6 @@ %prep %setup -n sleha-bootstrap-%{version} -%patch6 -p1 -%patch7 -p1 %build %install ++ _service ++ --- /var/tmp/diff_new_pack.TlEcTN/_old 2014-09-17 17:26:38.0 +0200 +++ /var/tmp/diff_new_pack.TlEcTN/_new 2014-09-17 17:26:38.0 +0200 @@ -4,7 +4,7 @@ git .git 0.4+git.%ct.%h -8d38b0b +8459115 ++ sleha-bootstrap-0.4+git.1408418098.8d38b0b.tar.bz2 -> sleha-bootstrap-0.4+git.1410854324.8459115.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1408418098.8d38b0b/scripts/ha-cluster-functions new/sleha-bootstrap-0.4+git.1410854324.8459115/scripts/ha-cluster-functions --- old/sleha-bootstrap-0.4+git.1408418098.8d38b0b/scripts/ha-cluster-functions 2014-08-19 13:58:22.0 +0200 +++ new/sleha-bootstrap-0.4+git.1410854324.8459115/scripts/ha-cluster-functions 2014-09-16 10:16:03.0 +0200 @@ -184,8 +184,7 @@ invoke rcSuSEfirewall2 restart \ || error "Failed to restart firewall" else - warn "Firewall is active - you may need to open ports:" - warn " TCP $tcp" + warn "Firewall is active. You may need to open these TCP ports: $tcp" fi } @@ -220,8 +219,7 @@ invoke rcSuSEfirewall2 restart \ || error "Failed to restart firewall" else - warn "Firewall is active - you may need to open ports:" - warn " UDP ${udp:-none}" + warn "Firewall is active. You may need to open these UDP ports: ${udp:-none}" fi } @@ -431,13 +429,22 @@ exit $rc } +check_watchdog() +{ + watchdog_dev=$(cat /etc/modules-load.d/watchdog.conf 2>&1|grep watchdog-device |cut -d"=" -f2 >/dev/null 2>&1) + if [ -z "$watchdog_dev" ]; then + watchdog_dev="/dev/watchdog" + fi + + wdctl $watchdog_dev >/dev/null 2>&1 +} + check_prereqs() { local -i warned=0 if ! my_hostname_resolves ; then - warn "Hostname '$(hostname)' is unresolvable - csync2 won't work." - warn "You should add an entry to /etc/hosts or configure DNS." + warn "Hostname '$(hostname)' is unresolvable - csync2 won't work. Please add an entry to /etc/hosts or configure DNS." warned=1 fi @@ -451,9 +458,8 @@ warned=1 fi - if ! [ -c /dev/watchdog ] ; then - warn "There does not appear to be a watchdog device. If you use" - warn "SBD the cluster will be unable to st
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2014-09-03 18:21:55 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2014-08-25 11:03:42.0 +0200 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2014-09-03 19:57:34.0 +0200 @@ -1,0 +2,12 @@ +Wed Aug 27 08:10:27 UTC 2014 - kgronl...@suse.com + +- Fix ha-cluster-init to init sbd configuration with new style (bnc#881484) +- Clean up multiline warnings (bnc#885411) +- Clean up patches: + - Added 0001-sbd_init_with_new_style.patch + - Added 0002-clean-up-multiline-warnings.patch + - Removed fix-ha-cluster-init-not-to-overwrite-sbd-conf-881484.patch + - Removed improve-ha-cluster-init-check-sbd-watchdog-bnc-881484.patch + - Removed fix-ha-cluster-init-sbd-with-new-style-bnc-881484.patch + +--- Old: fix-ha-cluster-init-not-to-overwrite-sbd-conf-881484.patch fix-ha-cluster-init-sbd-with-new-style-bnc-881484.patch improve-ha-cluster-init-check-sbd-watchdog-bnc-881484.patch New: 0001-sbd_init_with_new_style.patch 0002-clean-up-multiline-warnings.patch Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.Y6HWkq/_old 2014-09-03 19:57:36.0 +0200 +++ /var/tmp/diff_new_pack.Y6HWkq/_new 2014-09-03 19:57:36.0 +0200 @@ -25,12 +25,10 @@ Group: Productivity/Clustering/HA Url:https://github.com/tserong/sleha-bootstrap Source: sleha-bootstrap-%{version}.tar.bz2 -# PATCH-FIX: fix ha-cluster-init to init sbd configuration with new style(bnc#881484) -Patch3: fix-ha-cluster-init-sbd-with-new-style-bnc-881484.patch -# PATCH-IMPROVE: improve ha-cluster-init to check sbd watchdog -Patch4: improve-ha-cluster-init-check-sbd-watchdog-bnc-881484.patch -# PATCH-FIX: -Patch5: fix-ha-cluster-init-not-to-overwrite-sbd-conf-881484.patch +# PATCH-FIX-UPSTREAM: Fix ha-cluster-init to init sbd configuration with new style (bnc#881484) +Patch6: 0001-sbd_init_with_new_style.patch +# PATCH-FIX-UPSTREAM: Clean up multiline warnings (bnc#885411) +Patch7: 0002-clean-up-multiline-warnings.patch Requires: csync2 Requires: hawk @@ -49,9 +47,8 @@ %prep %setup -n sleha-bootstrap-%{version} -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%patch6 -p1 +%patch7 -p1 %build %install ++ 0001-sbd_init_with_new_style.patch ++ commit 281cee3f7fdd5aa06ace701c16b8c8cebca8d43d Author: Liuhua Wang Date: Thu Aug 21 15:19:01 2014 +0200 Fix ha-cluster-init to init sbd configuration with new style (bnc#881484) diff --git a/scripts/ha-cluster-init b/scripts/ha-cluster-init index 88bced4..75f4ede 100755 --- a/scripts/ha-cluster-init +++ b/scripts/ha-cluster-init @@ -456,6 +456,11 @@ Configure SBD: fi done SBD_DEVICE="$dev" + + SBD_WATCHDOG="yes" + if ! check_watchdog; then + warn "No watchdog device detected! SBD will not work without a watchdog." + fi fi [ -b "$SBD_DEVICE" ] || error "SBD device $SBD_DEVICE does not exist" @@ -467,12 +472,22 @@ Configure SBD: invoke sbd -d $SBD_DEVICE create || error "Failed to initialize SBD device" status_done - local tmp_conf=$SYSCONFIG_SBD.$$ - cat > $tmp_conf <> $SYSCONFIG_SBD + fi + if grep -E '^SBD_WATCHDOG=.*' $SYSCONFIG_SBD; then + sed -i -e "s/^SBD_WATCHDOG=.*/SBD_WATCHDOG=$SBD_WATCHDOG/g" $SYSCONFIG_SBD + else + echo "SBD_WATCHDOG=\"$SBD_WATCHDOG\"" >> $SYSCONFIG_SBD + fi + else + echo "SBD_DEVICE=\"$SBD_DEVICE\"" > $SYSCONFIG_SBD + echo "SBD_WATCHDOG=\"$SBD_WATCHDOG\"" >> $SYSCONFIG_SBD + fi + invoke csync2 -m $SYSCONFIG_SBD invoke csync2 -f $SYSCONFIG_SBD invoke csync2 -xv $SYSCONFIG_SBD ++ 0002-clean-up-multiline-warnings.patch ++ commit 743f181a0c0579068fa4a984b16f8b443029d7b0 Author: Kristoffer Grönlund Date: Tue Aug 26 10:38:31 2014 +0200 Clean up multiline warnings (bnc#885411) diff --git a/scripts/ha-cluster-functions b/scripts/ha-cluster-functions index 91be3d2..12955ae 100644 --- a/scripts/ha-cluster-functions +++ b/scripts/ha-cluster-functions @@ -184,8 +184,7 @@ init_firewall() in
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2014-08-25 11:03:15 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2014-08-16 15:38:14.0 +0200 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2014-08-25 11:03:42.0 +0200 @@ -1,0 +2,6 @@ +Tue Aug 19 11:58:43 UTC 2014 - kgronl...@suse.com + +- Use fdisk to limit partprobe to valid devices (bnc#885287) +- Upstream version cs:8d38b0b + +--- Old: sleha-bootstrap-0.4+git.1403274687.d4cddcc.tar.bz2 New: sleha-bootstrap-0.4+git.1408418098.8d38b0b.tar.bz2 Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.7qIHrg/_old 2014-08-25 11:03:43.0 +0200 +++ /var/tmp/diff_new_pack.7qIHrg/_new 2014-08-25 11:03:43.0 +0200 @@ -18,7 +18,7 @@ Name: ha-cluster-bootstrap -Version:0.4+git.1403274687.d4cddcc +Version:0.4+git.1408418098.8d38b0b Release:0 Summary:Pacemaker HA Cluster Bootstrap Tool License:GPL-2.0 ++ _service ++ --- /var/tmp/diff_new_pack.7qIHrg/_old 2014-08-25 11:03:43.0 +0200 +++ /var/tmp/diff_new_pack.7qIHrg/_new 2014-08-25 11:03:43.0 +0200 @@ -4,7 +4,7 @@ git .git 0.4+git.%ct.%h -d4cddcc +8d38b0b ++ sleha-bootstrap-0.4+git.1403274687.d4cddcc.tar.bz2 -> sleha-bootstrap-0.4+git.1408418098.8d38b0b.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1403274687.d4cddcc/scripts/ha-cluster-functions new/sleha-bootstrap-0.4+git.1408418098.8d38b0b/scripts/ha-cluster-functions --- old/sleha-bootstrap-0.4+git.1403274687.d4cddcc/scripts/ha-cluster-functions 2014-08-15 14:00:11.0 +0200 +++ new/sleha-bootstrap-0.4+git.1408418098.8d38b0b/scripts/ha-cluster-functions 2014-08-19 13:58:22.0 +0200 @@ -116,10 +116,22 @@ echo "done" } +abrev_probe (){ + # This function uses fdisk to create a list of valid devices for probing + # with partprobe. This prevents partprobe from failing on read-only mounted + # devices such as /dev/sr0 (etc) that might cause it to return an error when + # it exits. This allows partprobe to run without forcing _die to bail out. + # -Brandon Heaton + # ATT Training Engineer + # Data Center Engineer + # bhea...@suse.com + invoke partprobe $(fdisk -l 2>/dev/null|grep ^Disk\ \/|cut -d" " -f2|cut -d":" -f1|paste -s) +} + probe_partitions() { status_long "Probing for new partitions..." - invoke partprobe || warn "Failed to probe new partitions" + abrev_probe # ...somehow the new partitions don't always appear immediately? Need to verify/fix invoke sleep 5 status_done -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2014-08-16 15:37:59 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2014-06-30 21:50:27.0 +0200 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2014-08-16 15:38:14.0 +0200 @@ -1,0 +2,9 @@ +Fri Aug 15 12:01:14 UTC 2014 - kgronl...@suse.com + +- Support non-RSA SSH keys when joining node to existing cluster (bnc#878080) +- Remove merged patches: + - 0001-Make-check-for-no-quorum-policy-ignore-slighty-less-.patch + - 0002-Add-etc-drbd.conf-to-csync2-configuration-bnc-881683.patch +- Upstream version cs:d4cddcc + +--- Old: 0001-Make-check-for-no-quorum-policy-ignore-slighty-less-.patch 0002-Add-etc-drbd.conf-to-csync2-configuration-bnc-881683.patch sleha-bootstrap-0.4+git.1396958965.7f1629a.tar.bz2 New: sleha-bootstrap-0.4+git.1403274687.d4cddcc.tar.bz2 Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.rmfXbO/_old 2014-08-16 15:38:15.0 +0200 +++ /var/tmp/diff_new_pack.rmfXbO/_new 2014-08-16 15:38:15.0 +0200 @@ -18,17 +18,13 @@ Name: ha-cluster-bootstrap -Version:0.4+git.1396958965.7f1629a +Version:0.4+git.1403274687.d4cddcc Release:0 Summary:Pacemaker HA Cluster Bootstrap Tool License:GPL-2.0 Group: Productivity/Clustering/HA Url:https://github.com/tserong/sleha-bootstrap Source: sleha-bootstrap-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM: Make check for no-quorum-policy=ignore less strict -Patch1: 0001-Make-check-for-no-quorum-policy-ignore-slighty-less-.patch -# PATCH-FIX-UPSTREAM: Add /etc/drbd.conf to csync2 configuration (bnc#881683) -Patch2: 0002-Add-etc-drbd.conf-to-csync2-configuration-bnc-881683.patch # PATCH-FIX: fix ha-cluster-init to init sbd configuration with new style(bnc#881484) Patch3: fix-ha-cluster-init-sbd-with-new-style-bnc-881484.patch # PATCH-IMPROVE: improve ha-cluster-init to check sbd watchdog @@ -53,8 +49,6 @@ %prep %setup -n sleha-bootstrap-%{version} -%patch1 -p1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 ++ _service ++ --- /var/tmp/diff_new_pack.rmfXbO/_old 2014-08-16 15:38:15.0 +0200 +++ /var/tmp/diff_new_pack.rmfXbO/_new 2014-08-16 15:38:15.0 +0200 @@ -4,7 +4,7 @@ git .git 0.4+git.%ct.%h -7f1629a +d4cddcc ++ sleha-bootstrap-0.4+git.1396958965.7f1629a.tar.bz2 -> sleha-bootstrap-0.4+git.1403274687.d4cddcc.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1396958965.7f1629a/scripts/ha-cluster-init new/sleha-bootstrap-0.4+git.1403274687.d4cddcc/scripts/ha-cluster-init --- old/sleha-bootstrap-0.4+git.1396958965.7f1629a/scripts/ha-cluster-init 2014-04-08 14:12:12.0 +0200 +++ new/sleha-bootstrap-0.4+git.1403274687.d4cddcc/scripts/ha-cluster-init 2014-08-15 14:00:11.0 +0200 @@ -95,6 +95,17 @@ append /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys } +# This handles the slightly obscure case where the seed node has ssh keys, +# but those keys aren't present in the seed node's authorized_keys file. +init_ssh_remote() +{ + for key in id_rsa id_dsa id_ecdsa id_ed25519 ; do + [ -f /root/.ssh/$key ] || continue + grep -q -s "$(cat /root/.ssh/$key.pub)" /root/.ssh/authorized_keys \ + || append /root/.ssh/$key.pub /root/.ssh/authorized_keys + done +} + init_csync2() { status "Configuring csync2" @@ -127,6 +138,7 @@ include /etc/csync2/csync2.cfg; include /etc/csync2/key_hagroup; include /etc/ctdb/nodes; + include /etc/drbd.conf; include /etc/drbd.d; include /etc/ha.d/ldirectord.cf; include /etc/lvm/lvm.conf; @@ -594,12 +606,12 @@ rc=$? if [ "$stage" == "vgfs" ]; then [ $rc -ne 0 ] && error "Cluster is inactive - can't run vgfs stage" -elif [ "$stage" != "ssh" -a "$stage" != "csync2" -a "$stage" != "csync2_remote" ]; then +elif [ "$stage" != "ssh" -a "$stage" != "ssh_remote" -a "$stage" != "csync2" -a "$stage" != "csync2_remote" ]; then [ $rc -eq 0 ] && error "Cluster is currently active - can't run" fi -# Need hostname resolution to work, want NTP (but don't block
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2014-06-30 21:45:10 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2014-06-24 15:16:13.0 +0200 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2014-06-30 21:45:34.0 +0200 @@ -1,0 +2,7 @@ + +Fri Jun 20 02:26:46 UTC 2014 - lw...@suse.com + +- used `sed` only change the values present + add: fix-ha-cluster-init-not-to-overwrite-sbd-conf-881484.patch + +--- New: fix-ha-cluster-init-not-to-overwrite-sbd-conf-881484.patch Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.YkE7En/_old 2014-06-30 21:45:36.0 +0200 +++ /var/tmp/diff_new_pack.YkE7En/_new 2014-06-30 21:45:36.0 +0200 @@ -33,6 +33,8 @@ Patch3: fix-ha-cluster-init-sbd-with-new-style-bnc-881484.patch # PATCH-IMPROVE: improve ha-cluster-init to check sbd watchdog Patch4: improve-ha-cluster-init-check-sbd-watchdog-bnc-881484.patch +# PATCH-FIX: +Patch5: fix-ha-cluster-init-not-to-overwrite-sbd-conf-881484.patch Requires: csync2 Requires: hawk @@ -55,6 +57,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %install ++ fix-ha-cluster-init-not-to-overwrite-sbd-conf-881484.patch ++ Index: sleha-bootstrap-0.4+git.1396958965.7f1629a/scripts/ha-cluster-init === --- sleha-bootstrap-0.4+git.1396958965.7f1629a.orig/scripts/ha-cluster-init +++ sleha-bootstrap-0.4+git.1396958965.7f1629a/scripts/ha-cluster-init @@ -474,50 +474,10 @@ Configure SBD: status_long 'Initializing SBD...' invoke sbd -d $SBD_DEVICE create || error "Failed to initialize SBD device" status_done + + sed -i -e "s/SBD_DEVICE=.*/SBD_DEVICE=\"$(echo $SBD_DEVICE | sed 's/\//\\\//g')\"/g" $SYSCONFIG_SBD + sed -i -e "s/SBD_WATCHDOG=.*/SBD_WATCHDOG=$SBD_WATCHDOG/g" $SYSCONFIG_SBD - local tmp_conf=$SYSCONFIG_SBD.$$ - cat > $tmp_conf <
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2014-06-24 15:16:03 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2014-06-16 21:26:40.0 +0200 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2014-06-24 15:16:13.0 +0200 @@ -1,0 +2,7 @@ +Mon Jun 16 10:50:30 UTC 2014 - lw...@suse.com + +- improve ha-cluster-init will check sbd watchdog, if watchdog not work, + confirm with user whether to use watchdog. + Add: improve-ha-cluster-init-check-sbd-watchdog-bnc-881484.patch- + +--- New: improve-ha-cluster-init-check-sbd-watchdog-bnc-881484.patch Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.wDUw1p/_old 2014-06-24 15:16:13.0 +0200 +++ /var/tmp/diff_new_pack.wDUw1p/_new 2014-06-24 15:16:13.0 +0200 @@ -31,6 +31,8 @@ Patch2: 0002-Add-etc-drbd.conf-to-csync2-configuration-bnc-881683.patch # PATCH-FIX: fix ha-cluster-init to init sbd configuration with new style(bnc#881484) Patch3: fix-ha-cluster-init-sbd-with-new-style-bnc-881484.patch +# PATCH-IMPROVE: improve ha-cluster-init to check sbd watchdog +Patch4: improve-ha-cluster-init-check-sbd-watchdog-bnc-881484.patch Requires: csync2 Requires: hawk @@ -52,6 +54,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %install ++ improve-ha-cluster-init-check-sbd-watchdog-bnc-881484.patch ++ Index: sleha-bootstrap-0.4+git.1396958965.7f1629a/scripts/ha-cluster-init === --- sleha-bootstrap-0.4+git.1396958965.7f1629a.orig/scripts/ha-cluster-init +++ sleha-bootstrap-0.4+git.1396958965.7f1629a/scripts/ha-cluster-init @@ -445,6 +445,25 @@ Configure SBD: fi done SBD_DEVICE="$dev" + +watchdog_dev=$(cat /etc/modules-load.d/watchdog.conf 2>&1|grep watchdog-device |cut -d"=" -f2 >/dev/null 2>&1) +if [ -z "$watchdog_dev" ]; then +watchdog_dev="/dev/watchdog" +fi + +sbd_watchdog="yes" +wdctl $watchdog_dev >/dev/null 2>&1 +if [ $? -ne 0 ]; then +if confirm "Watchdog does not work. Do you still wish to use watchdog for SBD?"; then +error "Please make sure watchdog works or disable watchdog for SBD." +return +else +sbd_watchdog="no" +fi + +fi +SBD_WATCHDOG="$sbd_watchdog" + fi [ -b "$SBD_DEVICE" ] || error "SBD device $SBD_DEVICE does not exist" @@ -488,7 +507,7 @@ SBD_STARTMODE= # # Whether to use a watchdog. # -SBD_WATCHDOG= +SBD_WATCHDOG=$SBD_WATCHDOG ## Type: string ## Default: "" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2014-06-16 21:26:39 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2014-04-11 13:30:01.0 +0200 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2014-06-16 21:26:40.0 +0200 @@ -1,0 +2,15 @@ +Mon Jun 13 02:49:22 UTC 2014 - lw...@suse.com + +- fix cluster-init to init sbd configuration with new style(bnc#881484) + Add: fix-ha-cluster-init-sbd-with-new-style-bnc-881484.patch + +--- +Mon Jun 9 08:57:56 UTC 2014 - kgronl...@suse.com + +- Make check for no-quorum-policy=ignore slighty less rigid +- Add /etc/drbd.conf to csync2 configuration (bnc#881683) + +- Add 0001-Make-check-for-no-quorum-policy-ignore-slighty-less-.patch +- Add 0002-Add-etc-drbd.conf-to-csync2-configuration-bnc-881683.patch + +--- New: 0001-Make-check-for-no-quorum-policy-ignore-slighty-less-.patch 0002-Add-etc-drbd.conf-to-csync2-configuration-bnc-881683.patch fix-ha-cluster-init-sbd-with-new-style-bnc-881484.patch Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.nJxb3C/_old 2014-06-16 21:26:41.0 +0200 +++ /var/tmp/diff_new_pack.nJxb3C/_new 2014-06-16 21:26:41.0 +0200 @@ -25,6 +25,13 @@ Group: Productivity/Clustering/HA Url:https://github.com/tserong/sleha-bootstrap Source: sleha-bootstrap-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM: Make check for no-quorum-policy=ignore less strict +Patch1: 0001-Make-check-for-no-quorum-policy-ignore-slighty-less-.patch +# PATCH-FIX-UPSTREAM: Add /etc/drbd.conf to csync2 configuration (bnc#881683) +Patch2: 0002-Add-etc-drbd.conf-to-csync2-configuration-bnc-881683.patch +# PATCH-FIX: fix ha-cluster-init to init sbd configuration with new style(bnc#881484) +Patch3: fix-ha-cluster-init-sbd-with-new-style-bnc-881484.patch + Requires: csync2 Requires: hawk Requires: iproute2 @@ -42,6 +49,9 @@ %prep %setup -n sleha-bootstrap-%{version} +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %install ++ 0001-Make-check-for-no-quorum-policy-ignore-slighty-less-.patch ++ >From cebe9b42ef9eb3c08823b1f881bafc3cea842518 Mon Sep 17 00:00:00 2001 From: Tim Serong Date: Wed, 4 Jun 2014 18:10:28 +1000 Subject: [PATCH 1/2] Make check for no-quorum-policy=ignore slighty less rigid Signed-off-by: Tim Serong --- scripts/ha-cluster-join | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ha-cluster-join b/scripts/ha-cluster-join index 62af82822745..f2008fa4e725 100755 --- a/scripts/ha-cluster-join +++ b/scripts/ha-cluster-join @@ -192,7 +192,7 @@ join_cluster() invoke corosync-cfgtool -R # Ditch no-quorum-policy=ignore if we're going over two nodes - if [ $new_quorum -gt 2 ] && crm configure show | grep -q no-quorum-policy=ignore ; then + if [ $new_quorum -gt 2 ] && crm configure show | grep -q 'no-quorum-policy=.*ignore' ; then invoke crm_attribute --attr-name no-quorum-policy --delete-attr fi } -- 1.8.4.5 ++ 0002-Add-etc-drbd.conf-to-csync2-configuration-bnc-881683.patch ++ >From 6aa2d3d30e3cb446f6c32f0c86e967a0c5666c77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= Date: Mon, 9 Jun 2014 10:53:40 +0200 Subject: [PATCH 2/2] Add /etc/drbd.conf to csync2 configuration (bnc#881683) --- scripts/ha-cluster-init | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ha-cluster-init b/scripts/ha-cluster-init index e036ee59917f..66e94f7988b6 100755 --- a/scripts/ha-cluster-init +++ b/scripts/ha-cluster-init @@ -127,6 +127,7 @@ group ha_group include /etc/csync2/csync2.cfg; include /etc/csync2/key_hagroup; include /etc/ctdb/nodes; + include /etc/drbd.conf; include /etc/drbd.d; include /etc/ha.d/ldirectord.cf; include /etc/lvm/lvm.conf; -- 1.8.4.5 ++ fix-ha-cluster-init-sbd-with-new-style-bnc-881484.patch ++ Index: sleha-bootstrap-0.4+git.1396958965.7f1629a/scripts/ha-cluster-init === --- sleha-bootstrap-0.4+git.1396958965.7f1629a.orig/scripts/ha-cluster-init +++ sleha-bootstrap-0.4+git.1396958965.7f1629a/scripts/ha-cluster-init @@ -458,8 +458,45 @@ Configure SBD: local
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2014-04-11 13:30:00 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2014-03-22 18:02:38.0 +0100 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2014-04-11 13:30:01.0 +0200 @@ -1,0 +2,9 @@ +Tue Apr 8 12:12:22 UTC 2014 - tser...@suse.com + +- Update NTP check to handle ntpd.service (bnc#872106) +- Use `SuSEfirewall2 status` instead of `systemctl is-active` (bnc#869386) +- Don't set sbd_device in crm config (bnc#863527) +- Drop no-quorum-policy=ignore when adding third node +- Upstream version cs:7f1629a + +--- Old: sleha-bootstrap-0.4+git.1395382016.2964f4e.tar.bz2 New: sleha-bootstrap-0.4+git.1396958965.7f1629a.tar.bz2 Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.CoQvRy/_old 2014-04-11 13:30:02.0 +0200 +++ /var/tmp/diff_new_pack.CoQvRy/_new 2014-04-11 13:30:02.0 +0200 @@ -18,7 +18,7 @@ Name: ha-cluster-bootstrap -Version:0.4+git.1395382016.2964f4e +Version:0.4+git.1396958965.7f1629a Release:0 Summary:Pacemaker HA Cluster Bootstrap Tool License:GPL-2.0 ++ _service ++ --- /var/tmp/diff_new_pack.CoQvRy/_old 2014-04-11 13:30:02.0 +0200 +++ /var/tmp/diff_new_pack.CoQvRy/_new 2014-04-11 13:30:02.0 +0200 @@ -4,7 +4,7 @@ git .git 0.4+git.%ct.%h -2964f4e +7f1629a ++ sleha-bootstrap-0.4+git.1395382016.2964f4e.tar.bz2 -> sleha-bootstrap-0.4+git.1396958965.7f1629a.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1395382016.2964f4e/doc/TODO new/sleha-bootstrap-0.4+git.1396958965.7f1629a/doc/TODO --- old/sleha-bootstrap-0.4+git.1395382016.2964f4e/doc/TODO 2014-02-14 13:31:38.0 +0100 +++ new/sleha-bootstrap-0.4+git.1396958965.7f1629a/doc/TODO 2014-04-08 13:44:34.0 +0200 @@ -31,7 +31,6 @@ == STONITH Config == * See https://bugzilla.novell.com/show_bug.cgi?id=722405 for stonith timeout suggestions -* Drop no-quorum-policy=ignore when > 2 nodes. == Template Mode == diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1395382016.2964f4e/scripts/ha-cluster-functions new/sleha-bootstrap-0.4+git.1396958965.7f1629a/scripts/ha-cluster-functions --- old/sleha-bootstrap-0.4+git.1395382016.2964f4e/scripts/ha-cluster-functions 2014-03-21 07:07:35.0 +0100 +++ new/sleha-bootstrap-0.4+git.1396958965.7f1629a/scripts/ha-cluster-functions 2014-04-08 12:32:34.0 +0200 @@ -164,7 +164,7 @@ fi # No need to do anything else if the firewall is inactive - systemctl -q is-active SuSEfirewall2 || return + SuSEfirewall2 status > /dev/null 2>&1 || return # Firewall is active, either restart or complain if we couldn't tweak it if [ $fw_open -eq 1 ]; then @@ -200,7 +200,7 @@ fi # No need to do anything else if the firewall is inactive - systemctl -q is-active SuSEfirewall2 || return + SuSEfirewall2 status > /dev/null 2>&1 || return # Firewall is active, either restart or complain if we couldn't tweak it if [ $fw_open -eq 1 ]; then @@ -429,7 +429,12 @@ warned=1 fi - if ! service_is_on ntp.service ; then + local ntpd="ntp.service" + if systemctl list-unit-files | grep -q ntpd.service ; then + ntpd="ntpd.service" + fi + + if ! service_is_on $ntpd ; then warn "NTP is not configured to start at system boot." warned=1 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1395382016.2964f4e/scripts/ha-cluster-init new/sleha-bootstrap-0.4+git.1396958965.7f1629a/scripts/ha-cluster-init --- old/sleha-bootstrap-0.4+git.1395382016.2964f4e/scripts/ha-cluster-init 2014-03-07 12:57:20.0 +0100 +++ new/sleha-bootstrap-0.4+git.1396958965.7f1629a/scripts/ha-cluster-init 2014-04-08 14:12:12.0 +0200 @@ -501,7 +501,7 @@ # stonith-enabled, or it wipes out then entire # cib-bootstrap-options section # TODO: find out if this is a bug in the
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2014-03-22 14:48:27 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2014-03-09 18:22:54.0 +0100 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2014-03-22 18:02:38.0 +0100 @@ -1,0 +2,12 @@ +Fri Mar 21 06:07:40 UTC 2014 - tser...@suse.com + +- Fix test for active firewall (bnc#869386) +- Upstream version cs:2964f4e + +--- +Wed Mar 19 09:20:37 UTC 2014 - tser...@suse.com + +- Update firewall rules correctly for corosync.conf (bnc#868986) +- Upstream version cs:85bcef5 + +--- Old: sleha-bootstrap-0.4+git.1394193228.cc1daef.tar.bz2 New: sleha-bootstrap-0.4+git.1395382016.2964f4e.tar.bz2 Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.gpFnpm/_old 2014-03-22 18:02:38.0 +0100 +++ /var/tmp/diff_new_pack.gpFnpm/_new 2014-03-22 18:02:38.0 +0100 @@ -18,7 +18,7 @@ Name: ha-cluster-bootstrap -Version:0.4+git.1394193228.cc1daef +Version:0.4+git.1395382016.2964f4e Release:0 Summary:Pacemaker HA Cluster Bootstrap Tool License:GPL-2.0 ++ _service ++ --- /var/tmp/diff_new_pack.gpFnpm/_old 2014-03-22 18:02:38.0 +0100 +++ /var/tmp/diff_new_pack.gpFnpm/_new 2014-03-22 18:02:38.0 +0100 @@ -4,7 +4,7 @@ git .git 0.4+git.%ct.%h -cc1daef +2964f4e ++ sleha-bootstrap-0.4+git.1394193228.cc1daef.tar.bz2 -> sleha-bootstrap-0.4+git.1395382016.2964f4e.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1394193228.cc1daef/scripts/ha-cluster-functions new/sleha-bootstrap-0.4+git.1395382016.2964f4e/scripts/ha-cluster-functions --- old/sleha-bootstrap-0.4+git.1394193228.cc1daef/scripts/ha-cluster-functions 2014-03-07 12:57:20.0 +0100 +++ new/sleha-bootstrap-0.4+git.1395382016.2964f4e/scripts/ha-cluster-functions 2014-03-21 07:07:35.0 +0100 @@ -145,19 +145,11 @@ # ports for csync2, mgmtd, hawk & dlm respectively local tcp="30865 5560 7630 21064" - # all mcastports defined in corosync config - local udp - if [ -f "$COROSYNC_CONF" ]; then - udp=$(echo $(awk -F: '/^[[:space:]]*mcastport:/ {print $2}' \ - ${COROSYNC_CONF})) - fi - local -i fw_open=0 if [ -f "$SYSCONFIG_FW_CLUSTER" ]; then local tmp_conf=${SYSCONFIG_FW_CLUSTER}.$$ sed \ -e "s/^TCP=.*/TCP=\"$tcp\"/" \ - -e "s/^UDP=.*/UDP=\"$udp\"/" \ $SYSCONFIG_FW_CLUSTER > $tmp_conf install_tmp $tmp_conf $SYSCONFIG_FW_CLUSTER @@ -172,16 +164,52 @@ fi # No need to do anything else if the firewall is inactive - rcSuSEfirewall2 status >/dev/null 2>&1 || return + systemctl -q is-active SuSEfirewall2 || return + + # Firewall is active, either restart or complain if we couldn't tweak it + if [ $fw_open -eq 1 ]; then + status "Restarting firewall (TCP $tcp open)" + invoke rcSuSEfirewall2 restart \ + || error "Failed to restart firewall" + else + warn "Firewall is active - you may need to open ports:" + warn " TCP $tcp" + fi +} + +# Have to do this separately, as we need general firewall config early +# so csync2 works, but need corosync config *after* corosync.conf has +# been created/updated. +init_firewall_corosync() +{ + # all mcastports defined in corosync config + local udp + if [ -f "$COROSYNC_CONF" ]; then + udp=$(echo $(awk -F: '/^[[:space:]]*mcastport:/ {print $2}' \ + ${COROSYNC_CONF})) + fi + + local -i fw_open=0 + if [ -f "$SYSCONFIG_FW_CLUSTER" ]; then + local tmp_conf=${SYSCONFIG_FW_CLUSTER}.$$ + sed \ + -e "s/^UDP=.*/UDP=\"$udp\"/" \ + $SYSCONFIG_FW_CLUSTER > $tmp_conf + install_tmp $tmp_conf $SYSCONFIG_FW_CLUSTER + fw_open=1 + fi + + # No need to do anything else if the firewall is inactive + systemctl -q is-activ
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2014-03-09 18:22:51 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2014-02-28 16:25:06.0 +0100 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2014-03-09 18:22:54.0 +0100 @@ -1,0 +2,10 @@ +Fri Mar 7 11:57:29 UTC 2014 - tser...@suse.com + +- Warn if /dev/watchdog not present +- Set/clear two_node in corosync.conf (bnc#866435) +- Ensure corosync and SBD config are marked dirty before syncing +- Use `csync2 -R` to cleanup DB when removing node (bnc#867039) +- Sync all config files across all nodes when adding new node (bnc#867048) +- Upstream version cs:cc1daef + +--- Old: sleha-bootstrap-0.4+git.1393474526.37debd0.tar.bz2 New: sleha-bootstrap-0.4+git.1394193228.cc1daef.tar.bz2 Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.ACBTH5/_old 2014-03-09 18:22:54.0 +0100 +++ /var/tmp/diff_new_pack.ACBTH5/_new 2014-03-09 18:22:54.0 +0100 @@ -18,7 +18,7 @@ Name: ha-cluster-bootstrap -Version:0.4+git.1393474526.37debd0 +Version:0.4+git.1394193228.cc1daef Release:0 Summary:Pacemaker HA Cluster Bootstrap Tool License:GPL-2.0 ++ _service ++ --- /var/tmp/diff_new_pack.ACBTH5/_old 2014-03-09 18:22:54.0 +0100 +++ /var/tmp/diff_new_pack.ACBTH5/_new 2014-03-09 18:22:54.0 +0100 @@ -4,7 +4,7 @@ git .git 0.4+git.%ct.%h -37debd0 +cc1daef ++ sleha-bootstrap-0.4+git.1393474526.37debd0.tar.bz2 -> sleha-bootstrap-0.4+git.1394193228.cc1daef.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1393474526.37debd0/scripts/ha-cluster-functions new/sleha-bootstrap-0.4+git.1394193228.cc1daef/scripts/ha-cluster-functions --- old/sleha-bootstrap-0.4+git.1393474526.37debd0/scripts/ha-cluster-functions 2014-02-28 06:13:11.0 +0100 +++ new/sleha-bootstrap-0.4+git.1394193228.cc1daef/scripts/ha-cluster-functions 2014-03-07 12:57:20.0 +0100 @@ -404,6 +404,12 @@ warned=1 fi + if ! [ -c /dev/watchdog ] ; then + warn "There does not appear to be a watchdog device. If you use" + warn "SBD the cluster will be unable to start without a watchdog." + warned=1 + fi + if [ $warned -ne 0 ]; then confirm 'Do you want to continue anyway?' || exit fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1393474526.37debd0/scripts/ha-cluster-init new/sleha-bootstrap-0.4+git.1394193228.cc1daef/scripts/ha-cluster-init --- old/sleha-bootstrap-0.4+git.1393474526.37debd0/scripts/ha-cluster-init 2014-02-28 06:13:11.0 +0100 +++ new/sleha-bootstrap-0.4+git.1394193228.cc1daef/scripts/ha-cluster-init 2014-03-07 12:57:20.0 +0100 @@ -280,10 +280,13 @@ # see also corosync.conf.5 and votequorum.5 provider: corosync_votequorum expected_votes: 1 + two_node: 0 } END # fi install_tmp $tmp_conf $COROSYNC_CONF + invoke csync2 -m $COROSYNC_CONF + invoke csync2 -f $COROSYNC_CONF invoke csync2 -xv $COROSYNC_CONF } @@ -422,6 +425,8 @@ local tmp_conf=$SYSCONFIG_SBD.$$ sed -e 's/^\([^#].*\)$/#\1/g' $SYSCONFIG_SBD > $tmp_conf install_tmp $tmp_conf $SYSCONFIG_SBD + invoke csync2 -m $SYSCONFIG_SBD + invoke csync2 -f $SYSCONFIG_SBD invoke csync2 -xv $SYSCONFIG_SBD fi return @@ -456,6 +461,8 @@ SBD_OPTS="-W" END install_tmp $tmp_conf $SYSCONFIG_SBD + invoke csync2 -m $SYSCONFIG_SBD + invoke csync2 -f $SYSCONFIG_SBD invoke csync2 -xv $SYSCONFIG_SBD } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1393474526.37debd0/scripts/ha-cluster-join new/sleha-bootstrap-0.4+git.1394193228.cc1daef/scripts/ha-cluster-join --- old/sleha-bootstrap-0.4+git.1393474526.37debd0/scripts/ha-cluster-join 2014-02-14 1
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2014-02-28 16:25:05 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2014-02-18 14:44:37.0 +0100 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2014-02-28 16:25:06.0 +0100 @@ -1,0 +2,9 @@ +Fri Feb 28 05:13:43 UTC 2014 - tser...@suse.com + +- Use netstat to guess at the default route interface (bnc#854172) +- Don't add service section to corosync.conf (bnc#865041) +- Set corosync logging to_logfile: no +- Correctly detect unconfigured SBD when SBD_DEVICE="" (bnc#865260) +- Upstream version cs:37debd0 + +--- Old: sleha-bootstrap-0.4+git.1392700725.6daed36.tar.bz2 New: sleha-bootstrap-0.4+git.1393474526.37debd0.tar.bz2 Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.btYLbh/_old 2014-02-28 16:25:07.0 +0100 +++ /var/tmp/diff_new_pack.btYLbh/_new 2014-02-28 16:25:07.0 +0100 @@ -18,7 +18,7 @@ Name: ha-cluster-bootstrap -Version:0.4+git.1392700725.6daed36 +Version:0.4+git.1393474526.37debd0 Release:0 Summary:Pacemaker HA Cluster Bootstrap Tool License:GPL-2.0 ++ _service ++ --- /var/tmp/diff_new_pack.btYLbh/_old 2014-02-28 16:25:07.0 +0100 +++ /var/tmp/diff_new_pack.btYLbh/_new 2014-02-28 16:25:07.0 +0100 @@ -4,7 +4,7 @@ git .git 0.4+git.%ct.%h -6daed36 +37debd0 ++ sleha-bootstrap-0.4+git.1392700725.6daed36.tar.bz2 -> sleha-bootstrap-0.4+git.1393474526.37debd0.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1392700725.6daed36/scripts/ha-cluster-functions new/sleha-bootstrap-0.4+git.1393474526.37debd0/scripts/ha-cluster-functions --- old/sleha-bootstrap-0.4+git.1392700725.6daed36/scripts/ha-cluster-functions 2014-02-14 13:31:38.0 +0100 +++ new/sleha-bootstrap-0.4+git.1393474526.37debd0/scripts/ha-cluster-functions 2014-02-28 06:13:11.0 +0100 @@ -36,7 +36,7 @@ declare BE_QUIET=false declare YES_TO_ALL=false -declare NET_IF=eth0 +declare NET_IF="$(netstat -nr | grep '^0.0.0.0' | awk '{print ($(NF))}' 2>/dev/null)" declare IP_ADDRESS declare IP_NETWORK @@ -125,6 +125,14 @@ status_done } +# Gets currently configured SBD device, i.e. what's in /etc/sysconfig/sbd +# (deliberately run in a subshell so as to not pollute global namespace) +configured_sbd_device() +( + [ -f "$SYSCONFIG_SBD" ] && . $SYSCONFIG_SBD + echo $SBD_DEVICE +) + # Configure /etc/sysconfig/SuSEfirewall2.d/services/cluster in much the same # way as yast2-cluster does. If that file doesn't exist but the firewall is # on, warn the user that they'll need to configure things manually (the @@ -218,8 +226,10 @@ [ -n "$pass_msg" ] && \ warn "You should change the hacluster password to something more secure!" - if [ -f "$SYSCONFIG_SBD" ] && grep -q '^SBD_DEVICE=' $SYSCONFIG_SBD; then + if [ -n "$(configured_sbd_device)" ]; then invoke systemctl enable sbd.service + else + invoke systemctl disable sbd.service fi start_service pacemaker.service wait_for_cluster diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1392700725.6daed36/scripts/ha-cluster-init new/sleha-bootstrap-0.4+git.1393474526.37debd0/scripts/ha-cluster-init --- old/sleha-bootstrap-0.4+git.1392700725.6daed36/scripts/ha-cluster-init 2014-02-14 13:31:38.0 +0100 +++ new/sleha-bootstrap-0.4+git.1393474526.37debd0/scripts/ha-cluster-init 2014-02-28 06:13:11.0 +0100 @@ -236,10 +236,6 @@ cat > $tmp_conf <
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2014-02-18 14:44:36 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2014-02-15 08:04:43.0 +0100 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2014-02-18 14:44:37.0 +0100 @@ -1,0 +2,6 @@ +Tue Feb 18 06:05:35 UTC 2014 - tser...@suse.com + +- Run removal commands in bash shell to avoid prompts from zsh (bnc#862572) +- Upstream version:6daed36 + +--- Old: sleha-bootstrap-0.4+git.1392381039.b11cac6.tar.bz2 New: sleha-bootstrap-0.4+git.1392700725.6daed36.tar.bz2 Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.f5bQSa/_old 2014-02-18 14:44:38.0 +0100 +++ /var/tmp/diff_new_pack.f5bQSa/_new 2014-02-18 14:44:38.0 +0100 @@ -18,7 +18,7 @@ Name: ha-cluster-bootstrap -Version:0.4+git.1392381039.b11cac6 +Version:0.4+git.1392700725.6daed36 Release:0 Summary:Pacemaker HA Cluster Bootstrap Tool License:GPL-2.0 ++ _service ++ --- /var/tmp/diff_new_pack.f5bQSa/_old 2014-02-18 14:44:38.0 +0100 +++ /var/tmp/diff_new_pack.f5bQSa/_new 2014-02-18 14:44:38.0 +0100 @@ -4,7 +4,7 @@ git .git 0.4+git.%ct.%h -b11cac6 +6daed36 ++ sleha-bootstrap-0.4+git.1392381039.b11cac6.tar.bz2 -> sleha-bootstrap-0.4+git.1392700725.6daed36.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1392381039.b11cac6/scripts/ha-cluster-remove new/sleha-bootstrap-0.4+git.1392700725.6daed36/scripts/ha-cluster-remove --- old/sleha-bootstrap-0.4+git.1392381039.b11cac6/scripts/ha-cluster-remove 2014-02-14 13:31:38.0 +0100 +++ new/sleha-bootstrap-0.4+git.1392700725.6daed36/scripts/ha-cluster-remove 2014-02-18 07:05:06.0 +0100 @@ -143,9 +143,9 @@ || error "stop the service corosync on $SEED_HOST failed" #delete the configure file from the node $SEED_HOST - invoke ssh root@$HOST "rm -f $SYSCONFIG_SBD $CSYNC2_CFG \ + invoke ssh root@$HOST "bash -c \"rm -f $SYSCONFIG_SBD $CSYNC2_CFG \ $COROSYNC_CONF $CSYNC2_KEY \ - && rm -f /var/lib/heartbeat/crm/* /var/lib/pacemaker/cib/*" \ + && rm -f /var/lib/heartbeat/crm/* /var/lib/pacemaker/cib/*\"" \ || error "Delete the configure files failed" else #check node status -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2014-02-15 08:04:42 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2013-12-19 12:12:07.0 +0100 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2014-02-15 08:04:43.0 +0100 @@ -1,0 +2,6 @@ +Fri Feb 14 12:31:53 UTC 2014 - tser...@suse.com + +- Ensure SBD service is enabled if required (bnc#862765) +- Upstream version cs:b11cac6 + +--- Old: sleha-bootstrap-0.4+git.1386742804.f9adaaf.tar.bz2 New: sleha-bootstrap-0.4+git.1392381039.b11cac6.tar.bz2 Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.atX8Iu/_old 2014-02-15 08:04:43.0 +0100 +++ /var/tmp/diff_new_pack.atX8Iu/_new 2014-02-15 08:04:43.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package ha-cluster-bootstrap # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010-2011 Novell Inc. All Rights Reserved. # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: ha-cluster-bootstrap -Version:0.4+git.1386742804.f9adaaf +Version:0.4+git.1392381039.b11cac6 Release:0 Summary:Pacemaker HA Cluster Bootstrap Tool License:GPL-2.0 ++ _service ++ --- /var/tmp/diff_new_pack.atX8Iu/_old 2014-02-15 08:04:43.0 +0100 +++ /var/tmp/diff_new_pack.atX8Iu/_new 2014-02-15 08:04:43.0 +0100 @@ -4,7 +4,7 @@ git .git 0.4+git.%ct.%h -f9adaaf +b11cac6 ++ sleha-bootstrap-0.4+git.1386742804.f9adaaf.tar.bz2 -> sleha-bootstrap-0.4+git.1392381039.b11cac6.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1386742804.f9adaaf/scripts/ha-cluster-functions new/sleha-bootstrap-0.4+git.1392381039.b11cac6/scripts/ha-cluster-functions --- old/sleha-bootstrap-0.4+git.1386742804.f9adaaf/scripts/ha-cluster-functions 2013-12-12 06:35:58.0 +0100 +++ new/sleha-bootstrap-0.4+git.1392381039.b11cac6/scripts/ha-cluster-functions 2014-02-14 13:31:38.0 +0100 @@ -218,6 +218,9 @@ [ -n "$pass_msg" ] && \ warn "You should change the hacluster password to something more secure!" + if [ -f "$SYSCONFIG_SBD" ] && grep -q '^SBD_DEVICE=' $SYSCONFIG_SBD; then + invoke systemctl enable sbd.service + fi start_service pacemaker.service wait_for_cluster } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2013-12-19 12:12:05 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2013-10-06 14:34:46.0 +0200 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2013-12-19 12:12:07.0 +0100 @@ -1,0 +2,6 @@ +Thu Dec 12 05:35:01 UTC 2013 - tser...@suse.com + +- Fix subnet match in network detection (bnc#854783) +- Upstream version cs:f9adaaf + +--- Old: sleha-bootstrap-0.4+git.1380722991.d194e13.tar.bz2 New: sleha-bootstrap-0.4+git.1386742804.f9adaaf.tar.bz2 Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.YHJWS6/_old 2013-12-19 12:12:07.0 +0100 +++ /var/tmp/diff_new_pack.YHJWS6/_new 2013-12-19 12:12:07.0 +0100 @@ -18,7 +18,7 @@ Name: ha-cluster-bootstrap -Version:0.4+git.1380722991.d194e13 +Version:0.4+git.1386742804.f9adaaf Release:0 Summary:Pacemaker HA Cluster Bootstrap Tool License:GPL-2.0 ++ _service ++ --- /var/tmp/diff_new_pack.YHJWS6/_old 2013-12-19 12:12:07.0 +0100 +++ /var/tmp/diff_new_pack.YHJWS6/_new 2013-12-19 12:12:07.0 +0100 @@ -4,7 +4,7 @@ git .git 0.4+git.%ct.%h -d194e13 +f9adaaf ++ sleha-bootstrap-0.4+git.1380722991.d194e13.tar.bz2 -> sleha-bootstrap-0.4+git.1386742804.f9adaaf.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1380722991.d194e13/scripts/ha-cluster-functions new/sleha-bootstrap-0.4+git.1386742804.f9adaaf/scripts/ha-cluster-functions --- old/sleha-bootstrap-0.4+git.1380722991.d194e13/scripts/ha-cluster-functions 2013-10-02 16:11:08.0 +0200 +++ new/sleha-bootstrap-0.4+git.1386742804.f9adaaf/scripts/ha-cluster-functions 2013-12-12 06:35:58.0 +0100 @@ -425,12 +425,12 @@ if [ -z "$IP_ADDRESS" ]; then IP_ADDRESS=$(ip -o -f inet addr show primary | \ awk "/[[:space:]]${NET_IF}[[:space:]]/ {print \$4} " | - sed 's/\/[1-9][1-9]*//') + sed 's/\/[0-9]\+//') fi if [ -z "$IP_NETWORK" -a -n "$IP_ADDRESS" ]; then IP_NETWORK=$(ip route list | \ awk "/${IP_ADDRESS}/ { print \$1; }" | - sed 's/\/[1-9][1-9]//') + sed 's/\/[0-9]\+//') fi [ -z "$IP_ADDRESS" ] && \ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2013-10-06 14:34:45 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2013-09-27 17:32:52.0 +0200 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2013-10-06 14:34:46.0 +0200 @@ -1,0 +2,6 @@ +Wed Oct 2 14:12:08 UTC 2013 - tser...@suse.com + +- Unify OCFS2 config with Hawk (bnc#821124) and remove o2cb +- Upstream version cs:d194e13 + +--- Old: sleha-bootstrap-0.4+git.1380195050.119bc91.tar.bz2 New: sleha-bootstrap-0.4+git.1380722991.d194e13.tar.bz2 Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.snOl1U/_old 2013-10-06 14:34:47.0 +0200 +++ /var/tmp/diff_new_pack.snOl1U/_new 2013-10-06 14:34:47.0 +0200 @@ -18,7 +18,7 @@ Name: ha-cluster-bootstrap -Version:0.4+git.1380195050.119bc91 +Version:0.4+git.1380722991.d194e13 Release:0 Summary:Pacemaker HA Cluster Bootstrap Tool License:GPL-2.0 @@ -31,7 +31,6 @@ Requires: pacemaker Requires: pssh Requires: util-linux -Recommends: lvm2-clvm Recommends: ocfs2-tools # These three are required for ocfs2 setup, but not generic setup Recommends: parted ++ _service ++ --- /var/tmp/diff_new_pack.snOl1U/_old 2013-10-06 14:34:47.0 +0200 +++ /var/tmp/diff_new_pack.snOl1U/_new 2013-10-06 14:34:47.0 +0200 @@ -4,7 +4,7 @@ git .git 0.4+git.%ct.%h -119bc91 +d194e13 ++ sleha-bootstrap-0.4+git.1380195050.119bc91.tar.bz2 -> sleha-bootstrap-0.4+git.1380722991.d194e13.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1380195050.119bc91/scripts/ha-cluster-functions new/sleha-bootstrap-0.4+git.1380722991.d194e13/scripts/ha-cluster-functions --- old/sleha-bootstrap-0.4+git.1380195050.119bc91/scripts/ha-cluster-functions 2013-09-26 14:11:23.0 +0200 +++ new/sleha-bootstrap-0.4+git.1380722991.d194e13/scripts/ha-cluster-functions 2013-10-02 16:11:08.0 +0200 @@ -130,6 +130,8 @@ # on, warn the user that they'll need to configure things manually (the # assumption here is that yast2-cluster is generally also installed, so that # file should be present, and should be formatted reasonably sensibly). +# TODO(should): Create /etc/sysconfig/SuSEfirewall2.d/services/cluster +# as yast2-cluster isn't present on openSUSE 13.1 init_firewall() { # ports for csync2, mgmtd, hawk & dlm respectively diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1380195050.119bc91/scripts/ha-cluster-init new/sleha-bootstrap-0.4+git.1380722991.d194e13/scripts/ha-cluster-init --- old/sleha-bootstrap-0.4+git.1380195050.119bc91/scripts/ha-cluster-init 2013-09-26 14:11:23.0 +0200 +++ new/sleha-bootstrap-0.4+git.1380722991.d194e13/scripts/ha-cluster-init 2013-10-02 16:11:08.0 +0200 @@ -242,6 +242,9 @@ } totem { version:2 + secauth:off + cluster_name: hacluster + clear_node_high_bit: yes # Following are old corosync 1.4.x defaults from SLES # token: 5000 @@ -250,8 +253,6 @@ # consensus: 6000 # vsftype:none # max_messages: 20 -# clear_node_high_bit: yes -# secauth:off # threads:0 crypto_cipher: none @@ -505,8 +506,8 @@ } # Non-generic, i.e. not for use with every type of cluster you can imagine: -# creates specific cluster config (TODO: would be nice to template this in -# future somehow) +# creates specific cluster config (TODO: would be nice to just directly +# use Hawk's wizard template instead of including config directly here) init_vgfs() { [ -b "$OCFS2_DEVICE" ] || error "OCFS2 device $OCFS2_DEVICE does not exist" @@ -515,64 +516,50 @@ local tmp_conf=/tmp/crm.$$ cat > $tmp_conf &1; then - if ! confirm "Existing Physical Volume found on $OCFS2_DEVICE - destroy?"; then - invoke crm resource stop c-clusterfs - wait_for_stop "Waiting for resource to stop" c-clusterfs + if blkid $OCFS2_DEVICE 2>/dev/null | grep -q TYPE; then + if ! confirm "Exit
commit ha-cluster-bootstrap for openSUSE:Factory
Hello community, here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2013-09-27 17:32:51 Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New) Package is "ha-cluster-bootstrap" Changes: --- /work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes 2013-09-26 11:45:34.0 +0200 +++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2013-09-27 17:32:52.0 +0200 @@ -1,0 +2,12 @@ +Thu Sep 26 12:13:15 UTC 2013 - tser...@suse.com + +- Trigger corosync config reload after node join/remove +- Minor punctuation fixes for man pages +- Send crm_mon stderr to /dev/null while waiting for cluster bringup +- Warn on partprobe failure instead of hard error (bnc#840606) +- Remove mention of openais from csync2 config +- Don't mention openais when removing node +- Decrement expected_votes when removing node +- Upstream version cs:119bc91 + +--- Old: sleha-bootstrap.tar.bz2 New: sleha-bootstrap-0.4+git.1380195050.119bc91.tar.bz2 Other differences: -- ++ ha-cluster-bootstrap.spec ++ --- /var/tmp/diff_new_pack.Curuad/_old 2013-09-27 17:32:53.0 +0200 +++ /var/tmp/diff_new_pack.Curuad/_new 2013-09-27 17:32:53.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package ha-cluster-bootstrap # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010-2011 Novell Inc. All Rights Reserved. # # All modifications and additions to the file contributed by third parties @@ -17,15 +17,14 @@ # - Name: ha-cluster-bootstrap -Version:0.4 +Version:0.4+git.1380195050.119bc91 Release:0 -License:GPL-2.0 Summary:Pacemaker HA Cluster Bootstrap Tool -Url:https://github.com/tserong/sleha-bootstrap +License:GPL-2.0 Group: Productivity/Clustering/HA -Source: sleha-bootstrap.tar.bz2 +Url:https://github.com/tserong/sleha-bootstrap +Source: sleha-bootstrap-%{version}.tar.bz2 Requires: csync2 Requires: hawk Requires: iproute2 @@ -43,7 +42,7 @@ Tool to bootstrap a Pacemaker High Availability cluster in a hurry. %prep -%setup -n sleha-bootstrap +%setup -n sleha-bootstrap-%{version} %build %install ++ _service ++ --- /var/tmp/diff_new_pack.Curuad/_old 2013-09-27 17:32:53.0 +0200 +++ /var/tmp/diff_new_pack.Curuad/_new 2013-09-27 17:32:53.0 +0200 @@ -3,19 +3,8 @@ git://github.com/tserong/sleha-bootstrap.git git .git - - - - - -f5ffd1c +0.4+git.%ct.%h +119bc91 @@ -23,11 +12,5 @@ bz2 - + -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org