Hello community,

here is the log from the commit of package crmsh for openSUSE:Factory checked 
in at 2017-04-24 09:49:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
 and      /work/SRC/openSUSE:Factory/.crmsh.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "crmsh"

Mon Apr 24 09:49:14 2017 rev:118 rq:489715 version:3.0.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes      2017-03-16 
09:51:35.897254393 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-04-24 
09:49:15.651908733 +0200
@@ -1,0 +2,12 @@
+Fri Apr 21 05:45:15 UTC 2017 - b...@suse.com
+
+- low: remove bindnetaddr for unicast(bsc#1030437)
+- Add 0006-remove-bindnetaddr-for-unicast-bsc-1030437.patch
+
+-------------------------------------------------------------------
+Thu Apr 20 12:06:05 UTC 2017 - kgronl...@suse.com
+
+- medium: scripts/health: Make health script available as wizard (fate#320848) 
(fate#320866)
+- Add 0005-medium-scripts-health-Make-health-script-available-a.patch 
+
+-------------------------------------------------------------------

New:
----
  0005-medium-scripts-health-Make-health-script-available-a.patch
  0006-remove-bindnetaddr-for-unicast-bsc-1030437.patch

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

Other differences:
------------------
++++++ crmsh.spec ++++++
--- /var/tmp/diff_new_pack.onIQRZ/_old  2017-04-24 09:49:16.667765055 +0200
+++ /var/tmp/diff_new_pack.onIQRZ/_new  2017-04-24 09:49:16.675763924 +0200
@@ -50,7 +50,10 @@
 Patch3:         0003-medium-ui_cluster-Fix-init-with-no-arguments-bsc-102.patch
 # PATCH-FIX-UPSTREAM: low: utils: Use /proc for process discovery
 Patch4:         0004-low-utils-Use-proc-for-process-discovery.patch
-
+# PATCH-FIX-UPSTREAM: medium: scripts/health: Make health script available as 
wizard (fate#320848) (fate#320866)
+Patch5:         0005-medium-scripts-health-Make-health-script-available-a.patch
+# PATCH-FIX-UPSTREAM: low: remove bindnetaddr for unicast(bsc#1030437)
+Patch6:         0006-remove-bindnetaddr-for-unicast-bsc-1030437.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version}
 # Requiring pacemaker makes crmsh harder to build on other distributions,
@@ -156,6 +159,8 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 # Force the local time
 #

++++++ 0005-medium-scripts-health-Make-health-script-available-a.patch ++++++
>From e3d74556a75d387cab51b923873655809651adda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <k...@koru.se>
Date: Thu, 20 Apr 2017 10:56:52 +0200
Subject: [PATCH] medium: scripts/health: Make health script available as
 wizard (fate#320848) (fate#320866)

Enables running the cluster health check directly from hawk.
---
 scripts/health/collect.py |  6 +++++-
 scripts/health/main.yml   | 15 ++++++++++-----
 utils/crm_init.py         |  5 ++++-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/scripts/health/collect.py b/scripts/health/collect.py
index bb873687..15c2e5ce 100755
--- a/scripts/health/collect.py
+++ b/scripts/health/collect.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 import os
+import pwd
 import hashlib
 import platform
 import crm_script
@@ -16,6 +17,9 @@ def rpm_info():
 def logrotate_info():
     return {}
 
+def get_user():
+    return pwd.getpwuid(os.getuid()).pw_name
+
 def sys_info():
     sysname, nodename, release, version, machine = os.uname()
     #The first three columns measure CPU and IO utilization of the
@@ -38,7 +42,7 @@ def sys_info():
             'distname': distname,
             'distver': distver,
             'distid': distid,
-            'user': os.getlogin(),
+            'user': get_user(),
             'hostname': hostname,
             'uptime': uptime[0],
             'idletime': uptime[1],
diff --git a/scripts/health/main.yml b/scripts/health/main.yml
index 327fa179..7c59bddc 100644
--- a/scripts/health/main.yml
+++ b/scripts/health/main.yml
@@ -1,11 +1,16 @@
 version: 2.2
-category: Script
-shortdesc: Check the health of the cluster
-longdesc: Runs various checks to verify the health of the cluster nodes
+category: Basic
+shortdesc: Verify health and configuration
+longdesc: |
+  Checks and detects issues with the cluster, by creating and
+  analysing a cluster report.
+
+  Requires SSH access between cluster nodes. This command is
+  also available from the command line as "crm cluster health".
 actions:
   - collect: collect.py
-    shortdesc: Collect cluster information
+    shortdesc: Collect information
   - apply_local: hahealth.py
-    shortdesc: Run HA health check
+    shortdesc: Run cluster health check
   - report: report.py
     shortdesc: Report cluster state
diff --git a/utils/crm_init.py b/utils/crm_init.py
index 35384539..f695b6dc 100644
--- a/utils/crm_init.py
+++ b/utils/crm_init.py
@@ -1,4 +1,5 @@
 import os
+import pwd
 import re
 import platform
 import socket
@@ -43,6 +44,8 @@ def services_info():
     'check enabled/active services'
     return [service_info(service) for service in SERVICES]
 
+def get_user():
+    return pwd.getpwuid(os.getuid()).pw_name
 
 def sys_info():
     'system information'
@@ -58,7 +61,7 @@ def sys_info():
             'distname': distname,
             'distver': distver,
             'distid': distid,
-            'user': os.getlogin(),
+            'user': get_user(),
             'hostname': hostname,
             'fqdn': socket.getfqdn()}
 
-- 
2.12.0

++++++ 0006-remove-bindnetaddr-for-unicast-bsc-1030437.patch ++++++
>From f34b63fc26081d88f01d612d3d04df275dfa6c28 Mon Sep 17 00:00:00 2001
From: Bin Liu <b...@suse.com>
Date: Fri, 14 Apr 2017 17:58:49 +0800
Subject: [PATCH] remove bindnetaddr for unicast(bsc#1030437)

In a two-node cluster, I 've one node configured with open-vswtich:
5: br-fixed: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue
state UNKNOWN group default
inet 192.168.124.88/24 scope global br-fixed
inet 192.168.124.87/24 scope global secondary br-fixed

In this case, if you use unicast, and set both nodelist and bindnetaddr,
corosync will mess up the address in some condition, and Jan Friesse
also pointed that specifiing both bind addr and nodelist is kind of "not
very often used" configuration.

This patch removes bindnetaddr for unicast.
---
 crmsh/bootstrap.py | 8 +-------
 crmsh/corosync.py  | 9 +++++++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/crmsh/bootstrap.py b/crmsh/bootstrap.py
index fa993ac3..8f914aea 100644
--- a/crmsh/bootstrap.py
+++ b/crmsh/bootstrap.py
@@ -678,19 +678,13 @@ Configure Corosync (unicast):
         if not confirm("%s already exists - overwrite?" % (corosync.conf())):
             return
 
-    bindnetaddr = prompt_for_string(
-        'Network address to bind to (e.g.: 192.168.1.0)',
-        r'([0-9]+\.){3}[0-9]+', _context.ip_network)
-    if not bindnetaddr:
-        error("No value for bindnetaddr")
-
     mcastport = prompt_for_string('Port', '[0-9]+', "5405")
     if not mcastport:
         error("No value for mcastport")
 
     corosync.create_configuration(
         clustername=_context.cluster_name,
-        bindnetaddr=bindnetaddr,
+        bindnetaddr=None,
         mcastport=mcastport,
         transport="udpu")
     csync2_update(corosync.conf())
diff --git a/crmsh/corosync.py b/crmsh/corosync.py
index 74b2c995..cc3970c9 100644
--- a/crmsh/corosync.py
+++ b/crmsh/corosync.py
@@ -484,7 +484,7 @@ totem {
 
     interface {
         ringnumber:     0
-        bindnetaddr:    %(bindnetaddr)s
+        %(bindnetaddr)s
 %(mcast)s
         ttl:        1
     }
@@ -542,10 +542,15 @@ def create_configuration(clustername="hacluster",
     if transport is not None:
         transport_tmpl = "    transport: {}\n".format(transport)
 
+    if bindnetaddr is None:
+        bindnetaddr_tmpl = ""
+    else:
+        bindnetaddr_tmpl = "bindnetaddr: %s" % bindnetaddr
+
     config = {
         "clustername": clustername,
         "nodelist": nodelist_tmpl,
-        "bindnetaddr": bindnetaddr,
+        "bindnetaddr": bindnetaddr_tmpl,
         "mcast": mcast_tmpl,
         "transport": transport_tmpl,
     }
-- 
2.12.0


Reply via email to