Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2017-06-26 15:52:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
 and      /work/SRC/openSUSE:Factory/.crmsh.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "crmsh"

Mon Jun 26 15:52:59 2017 rev:125 rq:505852 version:3.0.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes      2017-06-23 
09:18:50.798350125 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-06-26 
15:52:59.997428443 +0200
@@ -1,0 +2,10 @@
+Fri Jun 23 09:27:04 UTC 2017 - kgronl...@suse.com
+
+- medium: bootstrap: Fix watchdog SBD envvars (bsc#1045118)
+  * Add 0019-medium-bootstrap-Fix-watchdog-SBD-envvars-bsc-104511.patch
+- medium: scripts: Relax broadcast IP validation (bsc#1044233)
+  * Add 0018-medium-scripts-Relax-broadcast-IP-validation-bsc-104.patch
+- medium: scripts: Clarify help text for NFS wizard (bsc#1044244)
+  * Add 0017-medium-scripts-Clarify-help-text-for-NFS-wizard-bsc-.patch
+
+-------------------------------------------------------------------

New:
----
  0017-medium-scripts-Clarify-help-text-for-NFS-wizard-bsc-.patch
  0018-medium-scripts-Relax-broadcast-IP-validation-bsc-104.patch
  0019-medium-bootstrap-Fix-watchdog-SBD-envvars-bsc-104511.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ crmsh.spec ++++++
--- /var/tmp/diff_new_pack.2hHnUj/_old  2017-06-26 15:53:00.757321290 +0200
+++ /var/tmp/diff_new_pack.2hHnUj/_new  2017-06-26 15:53:00.757321290 +0200
@@ -74,6 +74,12 @@
 Patch15:        0015-medium-ui_cluster-Add-force-to-ha-cluster-remove-bsc.patch
 # PATCH-FIX-UPSTREAM: high: bootstrap: Add option to enable diskless SBD mode 
to cluster init (bsc#1045118)
 Patch16:        0016-high-bootstrap-Add-option-to-enable-diskless-SBD-mod.patch
+# PATCH-FIX-UPSTREAM: medium: scripts: Clarify help text for NFS wizard 
(bsc#1044244)
+Patch17:        0017-medium-scripts-Clarify-help-text-for-NFS-wizard-bsc-.patch
+# PATCH-FIX-UPSTREAM: medium: scripts: Relax broadcast IP validation 
(bsc#1044233)
+Patch18:        0018-medium-scripts-Relax-broadcast-IP-validation-bsc-104.patch
+# PATCH-FIX-UPSTREAM: medium: bootstrap: Fix watchdog SBD envvars (bsc#1045118)
+Patch19:        0019-medium-bootstrap-Fix-watchdog-SBD-envvars-bsc-104511.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version}
@@ -192,6 +198,9 @@
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
 
 # Force the local time
 #

++++++ 0017-medium-scripts-Clarify-help-text-for-NFS-wizard-bsc-.patch ++++++
>From cf59cfdbdc63dc397f178d87b91fb9715b7722a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <k...@koru.se>
Date: Thu, 22 Jun 2017 18:04:14 +0200
Subject: [PATCH 17/19] medium: scripts: Clarify help text for NFS wizard
 (bsc#1044244)

---
 scripts/drbd/main.yml               | 2 ++
 scripts/lvm/main.yml                | 5 +++++
 scripts/nfsserver-lvm-drbd/main.yml | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/scripts/drbd/main.yml b/scripts/drbd/main.yml
index afb4f8ba..29ba472a 100644
--- a/scripts/drbd/main.yml
+++ b/scripts/drbd/main.yml
@@ -6,6 +6,8 @@ longdesc: >-
 
   Also creates a multistate resource managing the state of DRBD.
 
+  Does not create or modify the referenced DRBD configuration.
+
 parameters:
   - name: id
     shortdesc: DRBD Cluster Resource ID
diff --git a/scripts/lvm/main.yml b/scripts/lvm/main.yml
index ecde5244..381f56c4 100644
--- a/scripts/lvm/main.yml
+++ b/scripts/lvm/main.yml
@@ -1,5 +1,10 @@
 version: 2.2
 category: Script
+longdesc: >-
+  Configure a resource for managing an LVM volume group.
+
+  Does not create the referenced volume group.
+
 include:
   - agent: ocf:heartbeat:LVM
     name: lvm
diff --git a/scripts/nfsserver-lvm-drbd/main.yml 
b/scripts/nfsserver-lvm-drbd/main.yml
index 7a2a0050..233f26f4 100644
--- a/scripts/nfsserver-lvm-drbd/main.yml
+++ b/scripts/nfsserver-lvm-drbd/main.yml
@@ -28,7 +28,7 @@ longdesc: |
   For more details on what needs to be prepared to use
   this wizard, see the Highly Available NFS Storage with
   DRBD and Pacemaker section of the SUSE Linux Enterprise
-  High Availability Extension 12 SP1 documentation.
+  High Availability Extension documentation.
 
 parameters:
   - name: nfsserver_id
-- 
2.12.2

++++++ 0018-medium-scripts-Relax-broadcast-IP-validation-bsc-104.patch ++++++
>From 2ea05e740c1068527b38a899dc053a0a728a517e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <k...@koru.se>
Date: Thu, 22 Jun 2017 18:06:41 +0200
Subject: [PATCH 18/19] medium: scripts: Relax broadcast IP validation
 (bsc#1044233)

The broadcast field can also contain non-IP values
like "+" and "-".
---
 scripts/virtual-ip/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/virtual-ip/main.yml b/scripts/virtual-ip/main.yml
index 697bf745..1ccb19e6 100644
--- a/scripts/virtual-ip/main.yml
+++ b/scripts/virtual-ip/main.yml
@@ -15,7 +15,7 @@ include:
         type: integer
         required: false
       - name: broadcast
-        type: ip_address
+        type: string
         required: false
     ops: |
       op start timeout="20" op stop timeout="20"
-- 
2.12.2

++++++ 0019-medium-bootstrap-Fix-watchdog-SBD-envvars-bsc-104511.patch ++++++
>From a1700c3bc21f57b711874c3e502dc1bfbd8823d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <k...@koru.se>
Date: Fri, 23 Jun 2017 07:55:13 +0200
Subject: [PATCH 19/19] medium: bootstrap: Fix watchdog SBD envvars
 (bsc#1045118)

Fix issues reported in #204.
---
 crmsh/bootstrap.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crmsh/bootstrap.py b/crmsh/bootstrap.py
index 0fbe0f90..79d9720e 100644
--- a/crmsh/bootstrap.py
+++ b/crmsh/bootstrap.py
@@ -941,11 +941,10 @@ def init_sbd_diskless():
     else:
         log("Creating {} with diskless configuration".format(SYSCONFIG_SBD))
     utils.sysconfig_set(SYSCONFIG_SBD,
-                        SBD_WATCHDOG="yes",
                         SBD_PACEMAKER="yes",
                         SBD_STARTMODE="always",
                         SBD_DELAY_START="no",
-                        SBD_WATCHDOG_DEVICE=detect_watchdog_device())
+                        SBD_WATCHDOG_DEV=detect_watchdog_device())
     csync2_update(SYSCONFIG_SBD)
     status_done()
 
@@ -1052,7 +1051,8 @@ rsc_defaults rsc-options: resource-stickiness=1 
migration-threshold=3
         if not invoke("crm configure property stonith-enabled=true"):
             error("Can't enable STONITH for SBD")
     elif _context.diskless_sbd:
-        if not invoke("crm configure property stonith-enabled=true"):
+        # TODO: configure stonith-watchdog-timeout correctly
+        if not invoke("crm configure property stonith-enabled=true 
stonith-watchdog-timeout=5s"):
             error("Can't enable STONITH for diskless SBD")
 
 
-- 
2.12.2


Reply via email to