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.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes
2014-04-11 13:30:01.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Apr 8 12:12:22 UTC 2014 - [email protected]
+
+- 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.000000000 +0200
+++ /var/tmp/diff_new_pack.CoQvRy/_new 2014-04-11 13:30:02.000000000 +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.000000000 +0200
+++ /var/tmp/diff_new_pack.CoQvRy/_new 2014-04-11 13:30:02.000000000 +0200
@@ -4,7 +4,7 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="versionformat">0.4+git.%ct.%h</param>
- <param name="revision">2964f4e</param>
+ <param name="revision">7f1629a</param>
</service>
<service name="recompress" mode="disabled">
++++++ 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.000000000 +0100
+++ new/sleha-bootstrap-0.4+git.1396958965.7f1629a/doc/TODO 2014-04-08
13:44:34.000000000 +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.000000000 +0100
+++ new/sleha-bootstrap-0.4+git.1396958965.7f1629a/scripts/ha-cluster-functions
2014-04-08 12:32:34.000000000 +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.000000000 +0100
+++ new/sleha-bootstrap-0.4+git.1396958965.7f1629a/scripts/ha-cluster-init
2014-04-08 14:12:12.000000000 +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 crm shell
- invoke crm configure primitive stonith-sbd stonith:external/sbd
params sbd_device="$sbd_device" \
+ invoke crm configure primitive stonith-sbd stonith:external/sbd
\
|| 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.1395382016.2964f4e/scripts/ha-cluster-join
new/sleha-bootstrap-0.4+git.1396958965.7f1629a/scripts/ha-cluster-join
--- old/sleha-bootstrap-0.4+git.1395382016.2964f4e/scripts/ha-cluster-join
2014-03-07 12:57:20.000000000 +0100
+++ new/sleha-bootstrap-0.4+git.1396958965.7f1629a/scripts/ha-cluster-join
2014-04-08 13:44:34.000000000 +0200
@@ -190,6 +190,11 @@
# Trigger corosync config reload to ensure expected_votes is propagated
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
+ invoke crm_attribute --attr-name no-quorum-policy --delete-attr
+ fi
}
#------------------------------------------------------------------------------
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
