commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-11-02 09:41:59
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.3463 (New)
Package is "crmsh"
Mon Nov 2 09:41:59 2020 rev:196 rq:845076 version:4.2.0+git.1604052559.2a348644
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-10-22
14:26:52.602997753 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.3463/crmsh.changes2020-11-02
09:42:24.653726080 +0100
@@ -1,0 +2,25 @@
+Fri Oct 30 16:54:56 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1604052559.2a348644:
+ * Dev: behave: collect corosync.log if it defined in config file
+ * Fix: hb_report: collect corosync.log if it defined in config
file(bsc#1148874)
+ * Dev: unittest: remove .travis.yml
+ * Dev: unittest: remove test case which might rely on runtime environment
+ * Dev: unittest: Create .github/workflows/crmsh-ci.yml, to use github action
+ * Dev: unittest: adjust duplicated test function name
+
+---
+Tue Oct 27 19:54:05 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1603805337.0e19de06:
+ * Dev: unittest: unit test for function do_start/do_stop
+ * Fix: ui_cluster: check service status while start/stop(bsc#1177980)
+
+---
+Tue Oct 27 10:41:09 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1603785356.e1de2810:
+ * Dev: unittest: adjust unit test for stop_services change
+ * Dev: bootstrap: stop service which is active, not which is available
+
+---
Old:
crmsh-4.2.0+git.1603292079.8fae778b.tar.bz2
New:
crmsh-4.2.0+git.1604052559.2a348644.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.Fg7mLp/_old 2020-11-02 09:42:25.605726994 +0100
+++ /var/tmp/diff_new_pack.Fg7mLp/_new 2020-11-02 09:42:25.609726998 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1603292079.8fae778b
+Version:4.2.0+git.1604052559.2a348644
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.Fg7mLp/_old 2020-11-02 09:42:25.653727040 +0100
+++ /var/tmp/diff_new_pack.Fg7mLp/_new 2020-11-02 09:42:25.653727040 +0100
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- 8fae778bb08c028c0a42a49f432886dca8162a9a
\ No newline at end of file
+ d94b31b1cb3775b03e2120e8fcf43d9b10019f0b
\ No newline at end of file
++ crmsh-4.2.0+git.1603292079.8fae778b.tar.bz2 ->
crmsh-4.2.0+git.1604052559.2a348644.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1603292079.8fae778b/.github/workflows/crmsh-ci.yml
new/crmsh-4.2.0+git.1604052559.2a348644/.github/workflows/crmsh-ci.yml
--- old/crmsh-4.2.0+git.1603292079.8fae778b/.github/workflows/crmsh-ci.yml
1970-01-01 01:00:00.0 +0100
+++ new/crmsh-4.2.0+git.1604052559.2a348644/.github/workflows/crmsh-ci.yml
2020-10-30 11:09:19.0 +0100
@@ -0,0 +1,203 @@
+# This workflow will install Python dependencies, run tests and lint with a
single version of Python
+# For more information see:
https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+# For more information about secrets see:
https://docs.github.com/en/free-pro-team@latest/actions/reference/encrypted-secrets
+
+name: crmsh CI
+
+on:
+ push:
+branches: [ master ]
+ pull_request:
+branches: [ master ]
+
+env:
+ DOCKER_SCRIPT: ./test/docker_scripts.sh
+ FOLDER: /package
+ PACKAGE_NAME: crmsh
+ OBS_USER: ${{ secrets.OBS_USER }}
+ OBS_PASS: ${{ secrets.OBS_PASS }}
+ OBS_PROJECT: ${{ secrets.OBS_PROJECT }}
+ TARGET_PROJECT: ${{ secrets.TARGET_PROJECT }}
+
+jobs:
+ unit_test:
+runs-on: ubuntu-latest
+steps:
+- uses: actions/checkout@v2
+- name: Set up Python
+ uses: actions/setup-python@v2
+ with:
+python-version: 3.8
+- name: Install dependencies
+ run: |
+python -m pip install --upgrade pip
+pip install tox
+- name: Test with pytest in tox
+ run: |
+tox -v
+
+ functional_test_hb_report_bugs:
+runs-on: ubuntu-latest
+steps:
+- uses: actions/checkout@v2
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-10-22 14:25:47
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.3463 (New)
Package is "crmsh"
Thu Oct 22 14:25:47 2020 rev:195 rq:843293 version:4.2.0+git.1603292079.8fae778b
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-10-10
00:29:37.737161270 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.3463/crmsh.changes2020-10-22
14:26:52.602997753 +0200
@@ -1,0 +2,33 @@
+Wed Oct 21 18:31:29 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1603292079.8fae778b:
+ * Dev: behave: verify hawk was stopped when removing node
+ * Dev: unittest: adjust unit test for this PR#648
+ * Fix: bootstrap: Stop hawk service when removing node(bsc#1175708)
+
+---
+Tue Oct 20 03:22:10 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1603162937.49ce94a5:
+ * Dev: unittest: adjust unit test for service management codes refactor
+ * Dev: utils: Refactor service management code
+
+---
+Tue Oct 20 01:39:23 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1603156877.5b81da60:
+ * Fix: cibverify: give warning if crm_verify return warning(bsc#1122391)
+ * Dev: behave: verify convert score to kind
+ * Dev: unittest: unit test for score_to_kind function
+ * Dev: doc: remove score related in doc for rsc_order configure
+ * Fix: parse: convert score to kind for rsc_order configure(bsc#1122391)
+
+---
+Wed Oct 14 06:13:20 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1602654994.34e0eeb6:
+ * Dev: unittest: Unit test for related changes based on remove node bug
+ * Dev: behave: functional test for bug of removing node(bsc#1165644)
+ * Fix: bootstrap: remove specific configured address while removing
node(bsc#1165644)
+
+---
Old:
crmsh-4.2.0+git.1602225426.5f84efb5.tar.bz2
New:
crmsh-4.2.0+git.1603292079.8fae778b.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.TijjuJ/_old 2020-10-22 14:26:53.298998378 +0200
+++ /var/tmp/diff_new_pack.TijjuJ/_new 2020-10-22 14:26:53.302998382 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1602225426.5f84efb5
+Version:4.2.0+git.1603292079.8fae778b
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.TijjuJ/_old 2020-10-22 14:26:53.346998421 +0200
+++ /var/tmp/diff_new_pack.TijjuJ/_new 2020-10-22 14:26:53.346998421 +0200
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- 5f84efb5767a54c50095ce297864035a3fbeef6e
\ No newline at end of file
+ 8fae778bb08c028c0a42a49f432886dca8162a9a
\ No newline at end of file
++ crmsh-4.2.0+git.1602225426.5f84efb5.tar.bz2 ->
crmsh-4.2.0+git.1603292079.8fae778b.tar.bz2 ++
1773 lines of diff (skipped)
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-10-10 00:29:36
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.4249 (New)
Package is "crmsh"
Sat Oct 10 00:29:36 2020 rev:194 rq:840390 version:4.2.0+git.1602225426.5f84efb5
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-09-22
21:13:29.928051062 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.4249/crmsh.changes2020-10-10
00:29:37.737161270 +0200
@@ -1,0 +2,15 @@
+Fri Oct 09 06:53:46 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1602225426.5f84efb5:
+ * Dev: unittest: unit test for hb_report sanitize
+ * Dev: behave: functional test for hb_report sanitize
+ * Fix: hb_report: fix sanitize functionality(bsc#1163581)
+
+---
+Thu Sep 24 02:53:05 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1600915005.e8089225:
+ * FIx start_delay with start-delay
+ * fix on_fail should be on-fail
+
+---
Old:
crmsh-4.2.0+git.1600742357.6be225e5.tar.bz2
New:
crmsh-4.2.0+git.1602225426.5f84efb5.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.IbnFoH/_old 2020-10-10 00:29:38.373161585 +0200
+++ /var/tmp/diff_new_pack.IbnFoH/_new 2020-10-10 00:29:38.373161585 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1600742357.6be225e5
+Version:4.2.0+git.1602225426.5f84efb5
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.IbnFoH/_old 2020-10-10 00:29:38.417161607 +0200
+++ /var/tmp/diff_new_pack.IbnFoH/_new 2020-10-10 00:29:38.417161607 +0200
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- 6be225e5a9e397eaab21e063693d87a854d1d170
\ No newline at end of file
+ 5f84efb5767a54c50095ce297864035a3fbeef6e
\ No newline at end of file
++ crmsh-4.2.0+git.1600742357.6be225e5.tar.bz2 ->
crmsh-4.2.0+git.1602225426.5f84efb5.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.2.0+git.1600742357.6be225e5/.travis.yml
new/crmsh-4.2.0+git.1602225426.5f84efb5/.travis.yml
--- old/crmsh-4.2.0+git.1600742357.6be225e5/.travis.yml 2020-09-22
04:39:17.0 +0200
+++ new/crmsh-4.2.0+git.1602225426.5f84efb5/.travis.yml 2020-10-09
08:37:06.0 +0200
@@ -24,7 +24,7 @@
script:
- docker run -t -v "$(pwd):/app" $IMAGE /bin/sh -c "cd /app;
TOXENV=py38-codeclimate; tox"
-- name: "functional test for hb_report"
+- name: "functional test for hb_report bugs"
before_install:
- $FUNCTIONAL_TEST hb_report before_install
script:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.2.0+git.1600742357.6be225e5/crm.conf.in
new/crmsh-4.2.0+git.1602225426.5f84efb5/crm.conf.in
--- old/crmsh-4.2.0+git.1600742357.6be225e5/crm.conf.in 2020-09-22
04:39:17.0 +0200
+++ new/crmsh-4.2.0+git.1602225426.5f84efb5/crm.conf.in 2020-10-09
08:37:06.0 +0200
@@ -75,3 +75,42 @@
; collect_extra_logs = /var/log/messages /var/log/pacemaker.log
; remove_exist_dest = no
; single_node = no
+;
+; sanitize_rule = sanitize_pattern[:options] ...
+;
+; This defines the way to hide sensitive data generated by hb_report.
+;
+; 'sanitize_pattern' is a RegEx string, which is used to matches 'name'
+; field of CIB params. The sanitize process will hide 'value' of those
+; matched 'name:value' pairs in CIB, PE, pacemaker.log.
+;
+; 'options' is the predefined, and 'raw' is the only one defined
+; currently. With ':raw" option, the sanitize process will fetch
+; 'value' results out of CIB 'name:value' pairs, and use them to
+; hide all clear text occurence from all files hb_report collected.
+;
+; Example 1:
+; sanitize_rule = passw.*
+;
+; This is the default. It will hide password nam:value pairs.
+; The result of hb_report clould be like
+; name="password", value=**
+; @name=password @value=**
+; passwd=**
+;
+;
+; Example 2:
+; sanitize_rule = ip.*:raw
+;
+; This will only hide ip addresses. Example, the sanitize process will fetch
+; ip=10.10.10.10 and replace all clear text occurrence of "10.10.10.10"
+;
+;
+; Example 3:
+;
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-09-22 21:12:52
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.4249 (New)
Package is "crmsh"
Tue Sep 22 21:12:52 2020 rev:193 rq:835959 version:4.2.0+git.1600742357.6be225e5
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-09-12
00:10:42.221110285 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.4249/crmsh.changes2020-09-22
21:13:29.928051062 +0200
@@ -1,0 +2,8 @@
+Tue Sep 22 02:54:36 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1600742357.6be225e5:
+ * Low: config: Try to handle configparser.MissingSectionHeaderError while
reading config file
+ * Dev: behave: functional test for obscure sensitive data by default
+ * Medium: ui_configure: Obscure sensitive data by default(bsc#1163581)
+
+---
Old:
crmsh-4.2.0+git.1599810948.3db12a7a.tar.bz2
New:
crmsh-4.2.0+git.1600742357.6be225e5.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.knANL0/_old 2020-09-22 21:13:30.876051892 +0200
+++ /var/tmp/diff_new_pack.knANL0/_new 2020-09-22 21:13:30.880051895 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1599810948.3db12a7a
+Version:4.2.0+git.1600742357.6be225e5
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.knANL0/_old 2020-09-22 21:13:30.928051937 +0200
+++ /var/tmp/diff_new_pack.knANL0/_new 2020-09-22 21:13:30.928051937 +0200
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- 78b300261b5edb0b0b85703acc2fe3b67df95b33
\ No newline at end of file
+ 6be225e5a9e397eaab21e063693d87a854d1d170
\ No newline at end of file
++ crmsh-4.2.0+git.1599810948.3db12a7a.tar.bz2 ->
crmsh-4.2.0+git.1600742357.6be225e5.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.2.0+git.1599810948.3db12a7a/.travis.yml
new/crmsh-4.2.0+git.1600742357.6be225e5/.travis.yml
--- old/crmsh-4.2.0+git.1599810948.3db12a7a/.travis.yml 2020-09-11
09:55:48.0 +0200
+++ new/crmsh-4.2.0+git.1600742357.6be225e5/.travis.yml 2020-09-22
04:39:17.0 +0200
@@ -78,6 +78,12 @@
script:
- $FUNCTIONAL_TEST resource run
+- name: "functional test for configure sublevel bugs"
+ before_install:
+- $FUNCTIONAL_TEST configure before_install
+ script:
+- $FUNCTIONAL_TEST configure run bugs
+
- name: "functional test for geo cluster"
before_install:
- $FUNCTIONAL_TEST geo before_install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.2.0+git.1599810948.3db12a7a/crm.conf.in
new/crmsh-4.2.0+git.1600742357.6be225e5/crm.conf.in
--- old/crmsh-4.2.0+git.1599810948.3db12a7a/crm.conf.in 2020-09-11
09:55:48.0 +0200
+++ new/crmsh-4.2.0+git.1600742357.6be225e5/crm.conf.in 2020-09-22
04:39:17.0 +0200
@@ -20,6 +20,22 @@
; ignore_missing_metadata = no
; report_tool_options =
+; obscure_pattern option is the persisent configuration of CLI.
+; Example, for the high security concern, obscure_pattern = passw* | ip
+; which makes `crm configure show` is equal to
+;
+; node-1:~ # crm configure show obscure:passw* obscure:ip
+; node 1084783297: node1
+; primitive fence_device stonith:fence_ilo5 \
+; params password="**"
+; primitive ip IPaddr2 \
+; params ip="**"
+;
+; The default option is passw*
+; If you don't want to obscure, change the value to blank.
+;
+; obscure_pattern = passw*
+
[path]
; sharedir =
; cache =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.2.0+git.1599810948.3db12a7a/crmsh/config.py
new/crmsh-4.2.0+git.1600742357.6be225e5/crmsh/config.py
--- old/crmsh-4.2.0+git.1599810948.3db12a7a/crmsh/config.py 2020-09-11
09:55:48.0 +0200
+++ new/crmsh-4.2.0+git.1600742357.6be225e5/crmsh/config.py 2020-09-22
04:39:17.0 +0200
@@ -238,7 +238,8 @@
'dotty': opt_program('', ('dotty',)),
'dot': opt_program('', ('dot',)),
'ignore_missing_metadata': opt_boolean('no'),
-'report_tool_options': opt_string('')
+'report_tool_options': opt_string(''),
+
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-09-12 00:10:21
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.4249 (New)
Package is "crmsh"
Sat Sep 12 00:10:21 2020 rev:192 rq:833704 version:4.2.0+git.1599810948.3db12a7a
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-09-10
22:55:18.128417366 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.4249/crmsh.changes2020-09-12
00:10:42.221110285 +0200
@@ -1,0 +2,8 @@
+Fri Sep 11 08:10:15 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1599810948.3db12a7a:
+ * Dev: unittest: unit test for collect archived logs
+ * Dev: behave: functional test for collect archived logs
+ * Fix: hb_report: collect archived logs(bsc#1148873)
+
+---
Old:
crmsh-4.2.0+git.1599702667.157fc6b5.tar.bz2
New:
crmsh-4.2.0+git.1599810948.3db12a7a.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.cU0yfp/_old 2020-09-12 00:10:43.537111545 +0200
+++ /var/tmp/diff_new_pack.cU0yfp/_new 2020-09-12 00:10:43.537111545 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1599702667.157fc6b5
+Version:4.2.0+git.1599810948.3db12a7a
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.cU0yfp/_old 2020-09-12 00:10:43.577111583 +0200
+++ /var/tmp/diff_new_pack.cU0yfp/_new 2020-09-12 00:10:43.577111583 +0200
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- 14cf53e1d0e49747fbf0b93a60f75589d28d04ef
\ No newline at end of file
+ 78b300261b5edb0b0b85703acc2fe3b67df95b33
\ No newline at end of file
++ crmsh-4.2.0+git.1599702667.157fc6b5.tar.bz2 ->
crmsh-4.2.0+git.1599810948.3db12a7a.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.2.0+git.1599702667.157fc6b5/.travis.yml
new/crmsh-4.2.0+git.1599810948.3db12a7a/.travis.yml
--- old/crmsh-4.2.0+git.1599702667.157fc6b5/.travis.yml 2020-09-10
03:51:07.0 +0200
+++ new/crmsh-4.2.0+git.1599810948.3db12a7a/.travis.yml 2020-09-11
09:55:48.0 +0200
@@ -24,6 +24,12 @@
script:
- docker run -t -v "$(pwd):/app" $IMAGE /bin/sh -c "cd /app;
TOXENV=py38-codeclimate; tox"
+- name: "functional test for hb_report"
+ before_install:
+- $FUNCTIONAL_TEST hb_report before_install
+ script:
+- $FUNCTIONAL_TEST hb_report run bugs
+
- name: "regression test for bootstrap bugs"
before_install:
- $FUNCTIONAL_TEST bootstrap before_install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.2.0+git.1599702667.157fc6b5/data-manifest
new/crmsh-4.2.0+git.1599810948.3db12a7a/data-manifest
--- old/crmsh-4.2.0+git.1599702667.157fc6b5/data-manifest 2020-09-10
03:51:07.0 +0200
+++ new/crmsh-4.2.0+git.1599810948.3db12a7a/data-manifest 2020-09-11
09:55:48.0 +0200
@@ -71,6 +71,7 @@
test/features/bootstrap_sbd.feature
test/features/environment.py
test/features/geo_setup.feature
+test/features/hb_report_bugs.feature
test/features/qdevice_options.feature
test/features/qdevice_setup_remove.feature
test/features/qdevice_usercase.feature
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1599702667.157fc6b5/hb_report/utillib.py
new/crmsh-4.2.0+git.1599810948.3db12a7a/hb_report/utillib.py
--- old/crmsh-4.2.0+git.1599702667.157fc6b5/hb_report/utillib.py
2020-09-10 03:51:07.0 +0200
+++ new/crmsh-4.2.0+git.1599810948.3db12a7a/hb_report/utillib.py
2020-09-11 09:55:48.0 +0200
@@ -2,6 +2,7 @@
# See COPYING for license information.
import bz2
+import lzma
import datetime
import glob
import gzip
@@ -76,8 +77,9 @@
"""
ret = []
files = [logf]
-#files += glob.glob(logf+"*[0-9z]")
-for f in sorted(files, key=os.path.getctime):
+files += glob.glob(logf+"*[0-9z]")
+# like ls -t, newest first
+for f in sorted(files, key=os.path.getmtime, reverse=True):
# reset this var to check every file's format
constants.GET_STAMP_FUNC = None
res = is_our_log(f, from_time, to_time)
@@ -501,7 +503,7 @@
else:
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-09-10 22:53:10
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.4249 (New)
Package is "crmsh"
Thu Sep 10 22:53:10 2020 rev:191 rq:833350 version:4.2.0+git.1599702667.157fc6b5
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-08-25
09:34:05.556047477 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.4249/crmsh.changes2020-09-10
22:55:18.128417366 +0200
@@ -1,0 +2,17 @@
+Thu Sep 10 02:03:46 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1599702667.157fc6b5:
+ * Dev: unittest: adjust unit test for checking sbd package installed
+ * Low: bootstrap: check whether sbd package installed
+ * Dev: unittest: Improve unit test for qdevice configuration
+ * Dev: behave: Improve qdevice functional test
+ * Low: bootstrap: Improve qdevice configure process * More reasonable naming
for variables * More function docstrings * Move function to more reasonable
location * Create functions to integrate similar functions inside one * Change
big function to small one, more easier for unit test, like: * Refactor
functions * Create utils.cluster_run_cmd function to avoid using crm cluster
run directly in code
+
+---
+Wed Sep 09 08:24:03 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1599639093.ba35c7d1:
+ * Dev: unittest: adjust unittest for swap keys with other nodes when join_ssh
+ * Low: bootstrap: swap keys with other nodes when join_ssh(bsc#1176178)
+
+---
Old:
crmsh-4.2.0+git.1598257562.570eb99d.tar.bz2
New:
crmsh-4.2.0+git.1599702667.157fc6b5.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.UQoDhP/_old 2020-09-10 22:55:18.688418186 +0200
+++ /var/tmp/diff_new_pack.UQoDhP/_new 2020-09-10 22:55:18.692418192 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1598257562.570eb99d
+Version:4.2.0+git.1599702667.157fc6b5
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.UQoDhP/_old 2020-09-10 22:55:18.724418238 +0200
+++ /var/tmp/diff_new_pack.UQoDhP/_new 2020-09-10 22:55:18.724418238 +0200
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- d4e0b8e57815925f3d625bcfda0d538ca69c1e91
\ No newline at end of file
+ 14cf53e1d0e49747fbf0b93a60f75589d28d04ef
\ No newline at end of file
++ crmsh-4.2.0+git.1598257562.570eb99d.tar.bz2 ->
crmsh-4.2.0+git.1599702667.157fc6b5.tar.bz2 ++
3150 lines of diff (skipped)
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-08-25 09:32:32
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.3399 (New)
Package is "crmsh"
Tue Aug 25 09:32:32 2020 rev:190 rq:828895 version:4.2.0+git.1598257562.570eb99d
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-08-04
20:24:14.117019079 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.3399/crmsh.changes2020-08-25
09:34:05.556047477 +0200
@@ -1,0 +2,9 @@
+Mon Aug 24 08:38:32 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1598257562.570eb99d:
+ * Fix: bootstrap: revert ssh_merge function for compatibility(bsc#1175057)
+ * Dev: behave: adjust functional test for sbd config process changes
+ * Dev: unittest: adjust unit test cases for sbd config process changes
+ * Fix: bootstrap: adjust sbd config process to fix bug on sbd
stage(bsc#1175057)
+
+---
Old:
crmsh-4.2.0+git.1595940615.c452cc00.tar.bz2
New:
crmsh-4.2.0+git.1598257562.570eb99d.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.eodrrj/_old 2020-08-25 09:34:09.956050044 +0200
+++ /var/tmp/diff_new_pack.eodrrj/_new 2020-08-25 09:34:09.960050047 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1595940615.c452cc00
+Version:4.2.0+git.1598257562.570eb99d
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.eodrrj/_old 2020-08-25 09:34:09.992050065 +0200
+++ /var/tmp/diff_new_pack.eodrrj/_new 2020-08-25 09:34:09.992050065 +0200
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- 5350f49f9e5990568c2626a6b02446dcbfbca340
\ No newline at end of file
+ d4e0b8e57815925f3d625bcfda0d538ca69c1e91
\ No newline at end of file
++ crmsh-4.2.0+git.1595940615.c452cc00.tar.bz2 ->
crmsh-4.2.0+git.1598257562.570eb99d.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1595940615.c452cc00/crmsh/bootstrap.py
new/crmsh-4.2.0+git.1598257562.570eb99d/crmsh/bootstrap.py
--- old/crmsh-4.2.0+git.1595940615.c452cc00/crmsh/bootstrap.py 2020-07-28
14:50:15.0 +0200
+++ new/crmsh-4.2.0+git.1598257562.570eb99d/crmsh/bootstrap.py 2020-08-24
10:26:02.0 +0200
@@ -166,7 +166,6 @@
"""
self.sbd_devices_input = sbd_devices
self.diskless_sbd = diskless_sbd
-self._sbd_service_flag = False
self._sbd_devices = None
@staticmethod
@@ -309,35 +308,27 @@
"""
self._get_sbd_device()
if not self._sbd_devices and not self.diskless_sbd:
+invoke("systemctl disable sbd.service")
return
status_long("Initializing {}SBD...".format("diskless " if
self.diskless_sbd else ""))
self._initialize_sbd()
self._update_configuration()
+invoke("systemctl enable sbd.service")
status_done()
-# If process work through here, consider it's ready for enable service
-self._sbd_service_flag = True
-
-def manage_sbd_service(self):
-"""
-Manage sbd service, running on both init and join process
-"""
-if self._sbd_service_flag:
-invoke("systemctl enable sbd.service")
-else:
-invoke("systemctl disable sbd.service")
def configure_sbd_resource(self):
"""
Configure stonith-sbd resource and stonith-enabled property
"""
-if self._sbd_devices and self._get_sbd_device_from_config():
-if not invoke("crm configure primitive stonith-sbd
stonith:external/sbd pcmk_delay_max=30s"):
-error("Can't create stonith-sbd primitive")
-if not invoke("crm configure property stonith-enabled=true"):
-error("Can't enable STONITH for SBD")
-elif self.diskless_sbd:
-if not invoke("crm configure property stonith-enabled=true
stonith-watchdog-timeout=5s"):
-error("Can't enable STONITH for diskless SBD")
+if service_is_enabled("sbd.service"):
+if self._get_sbd_device_from_config():
+if not invoke("crm configure primitive stonith-sbd
stonith:external/sbd pcmk_delay_max=30s"):
+
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-08-04 20:23:54
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.3592 (New)
Package is "crmsh"
Tue Aug 4 20:23:54 2020 rev:189 rq:824235 version:4.2.0+git.1595940615.c452cc00
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-07-24
10:09:12.138124654 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.3592/crmsh.changes2020-08-04
20:24:14.117019079 +0200
@@ -1,0 +2,8 @@
+Tue Jul 28 13:02:41 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1595940615.c452cc00:
+ * Dev: unittest: test the case which command "crm corosync status quorum"
return code is 2
+ * Dev: behave: use "crm corosync status quorum" to check the quorum status
+ * Low: corosync: handle the return code of corosync-quorumtool
correctly(bsc#1174588)
+
+---
Old:
crmsh-4.2.0+git.1595517298.a06e892f.tar.bz2
New:
crmsh-4.2.0+git.1595940615.c452cc00.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.n82rLD/_old 2020-08-04 20:24:15.465019534 +0200
+++ /var/tmp/diff_new_pack.n82rLD/_new 2020-08-04 20:24:15.465019534 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1595517298.a06e892f
+Version:4.2.0+git.1595940615.c452cc00
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.n82rLD/_old 2020-08-04 20:24:15.513019550 +0200
+++ /var/tmp/diff_new_pack.n82rLD/_new 2020-08-04 20:24:15.513019550 +0200
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- 314ca14d291ce6c6856ff4571b6e59b3d4df9f10
\ No newline at end of file
+ 5350f49f9e5990568c2626a6b02446dcbfbca340
\ No newline at end of file
++ crmsh-4.2.0+git.1595517298.a06e892f.tar.bz2 ->
crmsh-4.2.0+git.1595940615.c452cc00.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1595517298.a06e892f/crmsh/corosync.py
new/crmsh-4.2.0+git.1595940615.c452cc00/crmsh/corosync.py
--- old/crmsh-4.2.0+git.1595517298.a06e892f/crmsh/corosync.py 2020-07-23
17:14:58.0 +0200
+++ new/crmsh-4.2.0+git.1595940615.c452cc00/crmsh/corosync.py 2020-07-28
14:50:15.0 +0200
@@ -66,12 +66,15 @@
def query_quorum_status():
"""
Query corosync quorum status
+
"""
utils.print_cluster_nodes()
rc, out, err = utils.get_stdout_stderr("corosync-quorumtool -s")
if rc != 0 and err:
raise ValueError(err)
-if rc == 0 and out:
+# If the return code of corosync-quorumtool is 2,
+# that means no problem appeared but node is not quorate
+if rc in [0, 2] and out:
print(out)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1595517298.a06e892f/test/features/qdevice_usercase.feature
new/crmsh-4.2.0+git.1595940615.c452cc00/test/features/qdevice_usercase.feature
---
old/crmsh-4.2.0+git.1595517298.a06e892f/test/features/qdevice_usercase.feature
2020-07-23 17:14:58.0 +0200
+++
new/crmsh-4.2.0+git.1595940615.c452cc00/test/features/qdevice_usercase.feature
2020-07-28 14:50:15.0 +0200
@@ -55,9 +55,9 @@
And Run "iptables -I INPUT -s 172.17.0.2 -j DROP; iptables -I OUTPUT
-d 172.17.0.2 -j DROP" on "hanode2"
# Check whether hanode1 has quorum, while hanode2 doesn't
And Run "sleep 20" on "hanode1"
-WhenRun "corosync-quorumtool -s" on "hanode1"
+WhenRun "crm corosync status quorum" on "hanode1"
ThenExpected "Quorate: Yes" in stdout
-WhenRun "ssh root@hanode2 corosync-quorumtool -s" on "hanode1"
+WhenRun "crm corosync status quorum" on "hanode2"
ThenExpected "Quorate: No" in stdout
And Show cluster status on "hanode1"
And Show cluster status on "hanode2"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1595517298.a06e892f/test/unittests/test_corosync.py
new/crmsh-4.2.0+git.1595940615.c452cc00/test/unittests/test_corosync.py
--- old/crmsh-4.2.0+git.1595517298.a06e892f/test/unittests/test_corosync.py
2020-07-23 17:14:58.0 +0200
+++
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-07-24 10:07:32
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.3592 (New)
Package is "crmsh"
Fri Jul 24 10:07:32 2020 rev:188 rq:822449 version:4.2.0+git.1595517298.a06e892f
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-07-17
20:50:10.372877903 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.3592/crmsh.changes2020-07-24
10:09:12.138124654 +0200
@@ -1,0 +2,7 @@
+Thu Jul 23 15:28:41 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1595517298.a06e892f:
+ * Dev: unittest: append unit test for corosync status related codes
+ * Low: ui_corosync: copy ssh key to qnetd while detect need
password(bsc#1174385)
+
+---
Old:
crmsh-4.2.0+git.1594286044.7a596d12.tar.bz2
New:
crmsh-4.2.0+git.1595517298.a06e892f.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.wvBXfz/_old 2020-07-24 10:09:16.502129030 +0200
+++ /var/tmp/diff_new_pack.wvBXfz/_new 2020-07-24 10:09:16.506129034 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1594286044.7a596d12
+Version:4.2.0+git.1595517298.a06e892f
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.wvBXfz/_old 2020-07-24 10:09:16.546129074 +0200
+++ /var/tmp/diff_new_pack.wvBXfz/_new 2020-07-24 10:09:16.546129074 +0200
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- 78ce77e47b195fc2ef4a21d5d83886b178bbc0e1
\ No newline at end of file
+ 314ca14d291ce6c6856ff4571b6e59b3d4df9f10
\ No newline at end of file
++ crmsh-4.2.0+git.1594286044.7a596d12.tar.bz2 ->
crmsh-4.2.0+git.1595517298.a06e892f.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1594286044.7a596d12/crmsh/corosync.py
new/crmsh-4.2.0+git.1595517298.a06e892f/crmsh/corosync.py
--- old/crmsh-4.2.0+git.1594286044.7a596d12/crmsh/corosync.py 2020-07-09
11:14:04.0 +0200
+++ new/crmsh-4.2.0+git.1595517298.a06e892f/crmsh/corosync.py 2020-07-23
17:14:58.0 +0200
@@ -36,6 +36,73 @@
return utils.get_stdout(['corosync-quorumtool'] + list(args), shell=False)
+def query_status(status_type):
+"""
+Query status of corosync
+
+Possible types could be ring/quorum/qnetd
+"""
+if status_type == "ring":
+query_ring_status()
+elif status_type == "quorum":
+query_quorum_status()
+elif status_type == "qnetd":
+query_qnetd_status()
+else:
+raise ValueError("Wrong type \"{}\" to query
status".format(status_type))
+
+
+def query_ring_status():
+"""
+Query corosync ring status
+"""
+rc, out, err = utils.get_stdout_stderr("corosync-cfgtool -s")
+if rc != 0 and err:
+raise ValueError(err)
+if rc == 0 and out:
+print(out)
+
+
+def query_quorum_status():
+"""
+Query corosync quorum status
+"""
+utils.print_cluster_nodes()
+rc, out, err = utils.get_stdout_stderr("corosync-quorumtool -s")
+if rc != 0 and err:
+raise ValueError(err)
+if rc == 0 and out:
+print(out)
+
+
+def query_qnetd_status():
+"""
+Query qnetd status
+"""
+if not utils.is_qdevice_configured():
+raise ValueError("QDevice/QNetd not configured!")
+cluster_name = get_value('totem.cluster_name')
+if not cluster_name:
+raise ValueError("cluster_name not configured!")
+qnetd_addr = get_value('quorum.device.net.host')
+if not qnetd_addr:
+raise ValueError("host for qnetd not configured!")
+
+# Configure ssh passwordless to qnetd if detect password is needed
+if utils.check_ssh_passwd_need(qnetd_addr):
+print("Copy ssh key to qnetd node({})".format(qnetd_addr))
+rc, _, err = utils.get_stdout_stderr("ssh-copy-id -i
/root/.ssh/id_rsa.pub root@{}".format(qnetd_addr))
+if rc != 0:
+raise ValueError(err)
+
+cmd = "corosync-qnetd-tool -lv -c {}".format(cluster_name)
+result = parallax.parallax_call([qnetd_addr], cmd)
+_, qnetd_result_stdout, _ = result[0][1]
+if qnetd_result_stdout:
+utils.print_cluster_nodes()
+print(utils.to_ascii(qnetd_result_stdout))
+
+
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-07-17 20:49:22
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.3592 (New)
Package is "crmsh"
Fri Jul 17 20:49:22 2020 rev:187 rq:821329 version:4.2.0+git.1594286044.7a596d12
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-07-08
19:18:55.556167918 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.3592/crmsh.changes2020-07-17
20:50:10.372877903 +0200
@@ -1,0 +2,6 @@
+Thu Jul 09 09:33:15 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1594286044.7a596d12:
+ * Low: hb_report: Fix collecting of binary data (bsc#1166962)
+
+---
Old:
crmsh-4.2.0+git.1594199184.309141ea.tar.bz2
New:
crmsh-4.2.0+git.1594286044.7a596d12.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.zxDmwS/_old 2020-07-17 20:50:11.632879217 +0200
+++ /var/tmp/diff_new_pack.zxDmwS/_new 2020-07-17 20:50:11.632879217 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1594199184.309141ea
+Version:4.2.0+git.1594286044.7a596d12
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.zxDmwS/_old 2020-07-17 20:50:11.680879267 +0200
+++ /var/tmp/diff_new_pack.zxDmwS/_new 2020-07-17 20:50:11.684879272 +0200
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- 7a1d008b1ffef8f266afc845f361f5e47e367e40
\ No newline at end of file
+ 78ce77e47b195fc2ef4a21d5d83886b178bbc0e1
\ No newline at end of file
++ crmsh-4.2.0+git.1594199184.309141ea.tar.bz2 ->
crmsh-4.2.0+git.1594286044.7a596d12.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.2.0+git.1594199184.309141ea/crmsh/utils.py
new/crmsh-4.2.0+git.1594286044.7a596d12/crmsh/utils.py
--- old/crmsh-4.2.0+git.1594199184.309141ea/crmsh/utils.py 2020-07-08
11:06:24.0 +0200
+++ new/crmsh-4.2.0+git.1594286044.7a596d12/crmsh/utils.py 2020-07-09
11:14:04.0 +0200
@@ -725,7 +725,7 @@
return rc
-def get_stdout(cmd, input_s=None, stderr_on=True, shell=True):
+def get_stdout(cmd, input_s=None, stderr_on=True, shell=True, raw=False):
'''
Run a cmd, return stdout output.
Optional input string "input_s".
@@ -743,10 +743,12 @@
stdout=subprocess.PIPE,
stderr=stderr)
stdout_data, stderr_data = proc.communicate(input_s)
+if raw:
+return proc.returncode, stdout_data
return proc.returncode, to_ascii(stdout_data).strip()
-def get_stdout_stderr(cmd, input_s=None, shell=True):
+def get_stdout_stderr(cmd, input_s=None, shell=True, raw=False):
'''
Run a cmd, return (rc, stdout, stderr)
'''
@@ -758,6 +760,8 @@
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
stdout_data, stderr_data = proc.communicate(input_s)
+if raw:
+return proc.returncode, stdout_data, stderr_data
return proc.returncode, to_ascii(stdout_data).strip(),
to_ascii(stderr_data).strip()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1594199184.309141ea/hb_report/constants.py
new/crmsh-4.2.0+git.1594286044.7a596d12/hb_report/constants.py
--- old/crmsh-4.2.0+git.1594199184.309141ea/hb_report/constants.py
2020-07-08 11:06:24.0 +0200
+++ new/crmsh-4.2.0+git.1594286044.7a596d12/hb_report/constants.py
2020-07-09 11:14:04.0 +0200
@@ -8,6 +8,7 @@
B_CONF = None
CIB_DIR = None
COMPRESS = config.report.compress
+COMPRESS_DATA_FLAG = "COMPRESS HB_REPORT DATA:::"
COMPRESS_PROG = ""
COMPRESS_EXT = ""
CORES_DIRS = None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1594199184.309141ea/hb_report/hb_report.in
new/crmsh-4.2.0+git.1594286044.7a596d12/hb_report/hb_report.in
--- old/crmsh-4.2.0+git.1594199184.309141ea/hb_report/hb_report.in
2020-07-08 11:06:24.0 +0200
+++ new/crmsh-4.2.0+git.1594286044.7a596d12/hb_report/hb_report.in
2020-07-09 11:14:04.0 +0200
@@ -280,13 +280,10 @@
# problem description template, and prints final notes
#
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-07-08 19:18:21
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.3060 (New)
Package is "crmsh"
Wed Jul 8 19:18:21 2020 rev:186 rq:819388 version:4.2.0+git.1594199184.309141ea
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-07-01
14:26:55.258809622 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.3060/crmsh.changes2020-07-08
19:18:55.556167918 +0200
@@ -1,0 +2,8 @@
+Wed Jul 08 09:18:41 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1594199184.309141ea:
+ * Dev: unittest: unit test for ssh key configuration improvement
+ * Dev: bahave: adjust based on ssh key configuration improvement
+ * High: bootstrap: ssh key configuration improvement(bsc#1169581)
+
+---
Old:
crmsh-4.2.0+git.1592790745.eaa14889.tar.bz2
New:
crmsh-4.2.0+git.1594199184.309141ea.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.o63zte/_old 2020-07-08 19:18:57.880176164 +0200
+++ /var/tmp/diff_new_pack.o63zte/_new 2020-07-08 19:18:57.884176179 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1592790745.eaa14889
+Version:4.2.0+git.1594199184.309141ea
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.o63zte/_old 2020-07-08 19:18:57.924176320 +0200
+++ /var/tmp/diff_new_pack.o63zte/_new 2020-07-08 19:18:57.924176320 +0200
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- be7cc3b187c4d63b47944e70ac7e6d79776c4668
\ No newline at end of file
+ 7a1d008b1ffef8f266afc845f361f5e47e367e40
\ No newline at end of file
++ crmsh-4.2.0+git.1592790745.eaa14889.tar.bz2 ->
crmsh-4.2.0+git.1594199184.309141ea.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1592790745.eaa14889/crmsh/bootstrap.py
new/crmsh-4.2.0+git.1594199184.309141ea/crmsh/bootstrap.py
--- old/crmsh-4.2.0+git.1592790745.eaa14889/crmsh/bootstrap.py 2020-06-22
03:52:25.0 +0200
+++ new/crmsh-4.2.0+git.1594199184.309141ea/crmsh/bootstrap.py 2020-07-08
11:06:24.0 +0200
@@ -41,6 +41,11 @@
SYSCONFIG_FW_CLUSTER = "/etc/sysconfig/SuSEfirewall2.d/services/cluster"
PCMK_REMOTE_AUTH = "/etc/pacemaker/authkey"
COROSYNC_CONF_ORIG = tmpfiles.create()[1]
+RSA_PRIVATE_KEY = "/root/.ssh/id_rsa"
+RSA_PUBLIC_KEY = "/root/.ssh/id_rsa.pub"
+AUTHORIZED_KEYS_FILE = "/root/.ssh/authorized_keys"
+
+
INIT_STAGES = ("ssh", "ssh_remote", "csync2", "csync2_remote", "corosync",
"storage", "sbd", "cluster", "vgfs", "admin", "qdevice")
@@ -129,6 +134,8 @@
error("Maximum number of interface is 2")
if len(self.nic_list) != len(set(self.nic_list)):
error("Duplicated input")
+if self.no_overwrite_sshkey:
+warn("--no-overwrite-sshkey option is deprecated since crmsh does
not overwrite ssh keys by default anymore and will be removed in future
versions")
def init_sbd_manager(self):
self.sbd_manager = SBDManager(self.sbd_devices, self.diskless_sbd)
@@ -956,6 +963,14 @@
tf.write(ff.read())
+def append_unique(fromfile, tofile):
+"""
+Append unique content from fromfile to tofile
+"""
+if not utils.check_file_content_included(fromfile, tofile):
+append(fromfile, tofile)
+
+
def rmfile(path, ignore_errors=False):
"""
Try to remove the given file, and
@@ -987,15 +1002,22 @@
Configure passwordless SSH.
"""
start_service("sshd.service")
-invoke("mkdir -m 700 -p /root/.ssh")
-if os.path.exists("/root/.ssh/id_rsa"):
-if _context.yes_to_all and _context.no_overwrite_sshkey or \
-not confirm("/root/.ssh/id_rsa already exists - overwrite?"):
-return
-rmfile("/root/.ssh/id_rsa")
-status("Generating SSH key")
-invoke("ssh-keygen -q -f /root/.ssh/id_rsa -C 'Cluster Internal' -N ''")
-append("/root/.ssh/id_rsa.pub", "/root/.ssh/authorized_keys")
+configure_local_ssh_key()
+
+
+def configure_local_ssh_key():
+"""
+Configure ssh rsa key locally
+
+If /root/.ssh/id_rsa not exist, generate a new one
+Add /root/.ssh/id_rsa.pub to
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-07-01 14:26:53
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.3060 (New)
Package is "crmsh"
Wed Jul 1 14:26:53 2020 rev:185 rq:817909 version:4.2.0+git.1592790745.eaa14889
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-05-20
18:46:28.337418458 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.3060/crmsh.changes2020-07-01
14:26:55.258809622 +0200
@@ -1,0 +2,23 @@
+Mon Jun 22 02:04:50 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1592790745.eaa14889:
+ * Dev: behave: functional test for bootstrap network improvement
+ * Dev: unittest: unit test for bootstrap network improvement
+ * High: bootstrap: bootstrap network improvement
+
+---
+Tue Jun 09 07:24:46 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1591686704.0b90c7c2:
+ * Revert "Fix: bootstrap: crmsh use its own specific ssh key(bsc#1169581)"
+ * Revert "Dev: hb_report: hb_report use crmsh key to ssh peer node"
+ * Revert "Dev: behave: related changes for functional test for using crmsh
ssh key"
+ * Revert "Dev: unittest: related changes for unittest for using crmsh ssh
key"
+
+---
+Wed Jun 03 00:01:50 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1591141885.522c462b:
+ * Low: cibconfig: Avoid adding the ID attribute to select_* nodes
+
+---
Old:
crmsh-4.2.0+git.1589895691.2fba0323.tar.bz2
New:
crmsh-4.2.0+git.1592790745.eaa14889.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.7IGVsa/_old 2020-07-01 14:26:55.814811347 +0200
+++ /var/tmp/diff_new_pack.7IGVsa/_new 2020-07-01 14:26:55.814811347 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1589895691.2fba0323
+Version:4.2.0+git.1592790745.eaa14889
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.7IGVsa/_old 2020-07-01 14:26:55.862811495 +0200
+++ /var/tmp/diff_new_pack.7IGVsa/_new 2020-07-01 14:26:55.862811495 +0200
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- 10ccd0921d28f0e6085528e2eb349c5cd31899dd
\ No newline at end of file
+ be7cc3b187c4d63b47944e70ac7e6d79776c4668
\ No newline at end of file
++ crmsh-4.2.0+git.1589895691.2fba0323.tar.bz2 ->
crmsh-4.2.0+git.1592790745.eaa14889.tar.bz2 ++
3192 lines of diff (skipped)
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-05-20 18:46:07
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2738 (New)
Package is "crmsh"
Wed May 20 18:46:07 2020 rev:184 rq:807420 version:4.2.0+git.1589895691.2fba0323
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-04-13
12:53:40.124658105 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2738/crmsh.changes2020-05-20
18:46:28.337418458 +0200
@@ -1,0 +2,18 @@
+Tue May 19 15:32:17 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1589895691.2fba0323:
+ * Dev: unittest: unit test for class SBDManager
+ * Dev: behave: functional test for sbd functionalities
+ * High: bootstrap: using class SBDManager for sbd configuration and
management(bsc#1170037, bsc#1170999)
+ * Dev: unittest: related changes for unittest for using crmsh ssh key
+ * Dev: behave: related changes for functional test for using crmsh ssh key
+ * Dev: hb_report: hb_report use crmsh key to ssh peer node
+ * Fix: bootstrap: crmsh use its own specific ssh key(bsc#1169581)
+
+---
+Wed May 06 08:56:06 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1588754732.bbb45e68:
+ * Low: bootstrap: change ha-cluster-bootstrap log path
+
+---
Old:
crmsh-4.2.0+git.1586769845.5cf0290e.tar.bz2
New:
crmsh-4.2.0+git.1589895691.2fba0323.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.6SMaVt/_old 2020-05-20 18:46:29.205420408 +0200
+++ /var/tmp/diff_new_pack.6SMaVt/_new 2020-05-20 18:46:29.209420417 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1586769845.5cf0290e
+Version:4.2.0+git.1589895691.2fba0323
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
@@ -226,6 +226,7 @@
%dir %{crmsh_docdir}
%dir %{crmsh_docdir}/contrib
%dir %attr (770, %{uname}, %{gname}) %{_var}/cache/crm
+%dir %attr (770, %{uname}, %{gname}) %{_var}/log/crmsh
%{_datadir}/bash-completion/completions/crm
%files scripts
++ _servicedata ++
--- /var/tmp/diff_new_pack.6SMaVt/_old 2020-05-20 18:46:29.249420507 +0200
+++ /var/tmp/diff_new_pack.6SMaVt/_new 2020-05-20 18:46:29.249420507 +0200
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- 5cf0290e56f929f03969d687863885f7975e6926
\ No newline at end of file
+ 10ccd0921d28f0e6085528e2eb349c5cd31899dd
\ No newline at end of file
++ crmsh-4.2.0+git.1586769845.5cf0290e.tar.bz2 ->
crmsh-4.2.0+git.1589895691.2fba0323.tar.bz2 ++
2007 lines of diff (skipped)
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-04-13 12:53:38
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.3248 (New)
Package is "crmsh"
Mon Apr 13 12:53:38 2020 rev:183 rq:793561 version:4.2.0+git.1586769845.5cf0290e
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-04-02
17:45:17.457524679 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.3248/crmsh.changes2020-04-13
12:53:40.124658105 +0200
@@ -1,0 +2,19 @@
+Mon Apr 13 09:34:31 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1586769845.5cf0290e:
+ * Low: ui_corosync: print cluster nodes while getting quorum and qnetd status
+
+---
+Thu Apr 09 10:29:47 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1586427566.1acaafaf:
+ * Low: bootstrap: exit with proper error messages when ssh return failed
+
+---
+Tue Apr 07 15:13:52 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1586271789.976af135:
+ * Dev: unittest: test interface_choice function
+ * Low: ui_cluster: use argparse choices to validate -i and -t option
+
+---
Old:
crmsh-4.2.0+git.1585823626.1dd5ce1f.tar.bz2
New:
crmsh-4.2.0+git.1586769845.5cf0290e.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.MAiMm6/_old 2020-04-13 12:53:41.004658489 +0200
+++ /var/tmp/diff_new_pack.MAiMm6/_new 2020-04-13 12:53:41.004658489 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1585823626.1dd5ce1f
+Version:4.2.0+git.1586769845.5cf0290e
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.MAiMm6/_old 2020-04-13 12:53:41.040658505 +0200
+++ /var/tmp/diff_new_pack.MAiMm6/_new 2020-04-13 12:53:41.040658505 +0200
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- d696fa20dd2f583a4b465a9ad40da708f70d0eee
\ No newline at end of file
+ 5cf0290e56f929f03969d687863885f7975e6926
\ No newline at end of file
++ crmsh-4.2.0+git.1585823626.1dd5ce1f.tar.bz2 ->
crmsh-4.2.0+git.1586769845.5cf0290e.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1585823626.1dd5ce1f/crmsh/bootstrap.py
new/crmsh-4.2.0+git.1586769845.5cf0290e/crmsh/bootstrap.py
--- old/crmsh-4.2.0+git.1585823626.1dd5ce1f/crmsh/bootstrap.py 2020-04-02
12:33:46.0 +0200
+++ new/crmsh-4.2.0+git.1586769845.5cf0290e/crmsh/bootstrap.py 2020-04-13
11:24:05.0 +0200
@@ -1622,7 +1622,15 @@
def init_qdevice():
def copy_ssh_id_to_qnetd():
status("Copy ssh key to qnetd node({})".format(qnetd_addr))
-invoke("ssh-copy-id -i /root/.ssh/id_rsa.pub
root@{}".format(qnetd_addr))
+if not invoke("ssh-copy-id -i /root/.ssh/id_rsa.pub
root@{}".format(qnetd_addr)):
+error_msg = "Failed to copy ssh key"
+if not _context.stage:
+suggest = """
+Cluster service already successfully started on this node.
+If you still want to use qdevice, run previous init command with \"qdevice\"
stage.
+That will setup qdevice separately"""
+error_msg += suggest
+error(error_msg)
def qdevice_cert_process():
_context.qdevice.init_db_on_qnetd()
@@ -1705,7 +1713,8 @@
tmpdir = tmpfiles.create_dir()
status("Retrieving SSH keys - This may prompt for root@%s:" % (seed_host))
-invoke("scp -oStrictHostKeyChecking=no root@%s:'/root/.ssh/id_*' %s/" %
(seed_host, tmpdir))
+if not invoke("scp -oStrictHostKeyChecking=no root@%s:'/root/.ssh/id_*'
%s/" % (seed_host, tmpdir)):
+error("Failed to retrieve ssh keys")
# This supports all SSH key types, for the case where ha-cluster-init
# wasn't used to set up the seed node, and the user has manually
@@ -2539,7 +2548,8 @@
# TODO: clean this up
status("Retrieving configuration - This may prompt for root@%s:" % (node))
tmpdir = tmpfiles.create_dir()
-invoke("scp -oStrictHostKeyChecking=no root@%s:'/etc/booth/*' %s/" %
(node, tmpdir))
+if not invoke("scp -oStrictHostKeyChecking=no root@%s:'/etc/booth/*' %s/"
% (node, tmpdir)):
+
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-04-02 17:44:54
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.3248 (New)
Package is "crmsh"
Thu Apr 2 17:44:54 2020 rev:182 rq:790853 version:4.2.0+git.1585823626.1dd5ce1f
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-03-31
17:16:49.691687913 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.3248/crmsh.changes2020-04-02
17:45:17.457524679 +0200
@@ -1,0 +2,7 @@
+Thu Apr 02 10:44:30 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1585823626.1dd5ce1f:
+ * Low: corosync: Use with statement to open file
+ * Dev: unittest: change test_add_node_ucast to make whole test reentrant
+
+---
Old:
crmsh-4.2.0+git.1585643641.b911e2f1.tar.bz2
New:
crmsh-4.2.0+git.1585823626.1dd5ce1f.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.pABwQn/_old 2020-04-02 17:45:18.445525873 +0200
+++ /var/tmp/diff_new_pack.pABwQn/_new 2020-04-02 17:45:18.449525877 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1585643641.b911e2f1
+Version:4.2.0+git.1585823626.1dd5ce1f
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.pABwQn/_old 2020-04-02 17:45:18.481525916 +0200
+++ /var/tmp/diff_new_pack.pABwQn/_new 2020-04-02 17:45:18.481525916 +0200
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- b911e2f1e12dd566bb01d6ebe3173bab9d4bf7a9
\ No newline at end of file
+ d696fa20dd2f583a4b465a9ad40da708f70d0eee
\ No newline at end of file
++ crmsh-4.2.0+git.1585643641.b911e2f1.tar.bz2 ->
crmsh-4.2.0+git.1585823626.1dd5ce1f.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1585643641.b911e2f1/crmsh/corosync.py
new/crmsh-4.2.0+git.1585823626.1dd5ce1f/crmsh/corosync.py
--- old/crmsh-4.2.0+git.1585643641.b911e2f1/crmsh/corosync.py 2020-03-31
10:34:01.0 +0200
+++ new/crmsh-4.2.0+git.1585823626.1dd5ce1f/crmsh/corosync.py 2020-04-02
12:33:46.0 +0200
@@ -867,8 +867,8 @@
find_configured_ip(ip_list)
-f = open(conf()).read()
-p = Parser(f)
+with open(conf()) as f:
+p = Parser(f.read())
if node_id is None:
node_id = get_free_nodeid(p)
@@ -886,9 +886,8 @@
if p.get("quorum.device.model") == "net":
p.set('quorum.two_node', '0')
-f = open(conf(), 'w')
-f.write(p.to_string())
-f.close()
+with open(conf(), 'w') as f:
+f.write(p.to_string())
def add_node(addr, name=None):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1585643641.b911e2f1/test/unittests/test_corosync.py
new/crmsh-4.2.0+git.1585823626.1dd5ce1f/test/unittests/test_corosync.py
--- old/crmsh-4.2.0+git.1585643641.b911e2f1/test/unittests/test_corosync.py
2020-03-31 10:34:01.0 +0200
+++ new/crmsh-4.2.0+git.1585823626.1dd5ce1f/test/unittests/test_corosync.py
2020-04-02 12:33:46.0 +0200
@@ -146,28 +146,68 @@
mock_open_file.assert_called_once_with(mock_conf.return_value)
mock_isv6.assert_called_once_with("10.10.10.2")
mock_ip_local.assert_called_once_with(False)
-mock_search.assert_called_once_with("nodelist.node.ring[0-9]*_addr",
"nodelist.node.ring0_addr")
+# For some reason mock_search.assert_called_once_with does not work
+
mock_search.assert_has_calls([mock.call("nodelist.node.ring[0-9]*_addr",
"nodelist.node.ring0_addr")])
-def test_add_node_ucast(self):
-from crmsh.corosync import add_node_ucast, get_values
+@mock.patch("crmsh.corosync.make_section")
+@mock.patch("crmsh.corosync.get_values")
+@mock.patch("crmsh.corosync.make_value")
+@mock.patch("crmsh.corosync.get_free_nodeid")
+@mock.patch("crmsh.corosync.Parser")
+@mock.patch("builtins.open", create=True)
+@mock.patch("crmsh.corosync.conf")
+@mock.patch("crmsh.corosync.find_configured_ip")
+def test_add_node_ucast(self, mock_find_ip, mock_conf, mock_open_file,
mock_parser,
+mock_free_id, mock_make_value, mock_get_values, mock_make_section):
+mock_parser_inst = mock.Mock()
+
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-03-31 17:16:47
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.3160 (New)
Package is "crmsh"
Tue Mar 31 17:16:47 2020 rev:181 rq:790038 version:4.2.0+git.1585643641.b911e2f1
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-03-27
21:58:01.326818044 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.3160/crmsh.changes2020-03-31
17:16:49.691687913 +0200
@@ -1,0 +2,15 @@
+Tue Mar 31 08:46:58 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1585643641.b911e2f1:
+ * Fix: ui_resource: refresh should complete resource first(bsc#1167220)
+
+---
+Mon Mar 30 08:25:20 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1585556306.3424694f:
+ * Dev: behave: change for deprecated alias
+ * Dev: testcases: change for deprecated alias
+ * Low: ui_context: give warning if using alias command
+ * Fix: doc: Update man page about completion example of crm
resource(bsc#1166644)
+
+---
Old:
crmsh-4.2.0+git.1585276059.882beb65.tar.bz2
New:
crmsh-4.2.0+git.1585643641.b911e2f1.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.wwSpqv/_old 2020-03-31 17:16:50.735688577 +0200
+++ /var/tmp/diff_new_pack.wwSpqv/_new 2020-03-31 17:16:50.739688579 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1585276059.882beb65
+Version:4.2.0+git.1585643641.b911e2f1
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.wwSpqv/_old 2020-03-31 17:16:50.767688597 +0200
+++ /var/tmp/diff_new_pack.wwSpqv/_new 2020-03-31 17:16:50.767688597 +0200
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- 25123c13b0eb32e24e39d87cce11b5267f95ebe7
\ No newline at end of file
+ b911e2f1e12dd566bb01d6ebe3173bab9d4bf7a9
\ No newline at end of file
++ crmsh-4.2.0+git.1585276059.882beb65.tar.bz2 ->
crmsh-4.2.0+git.1585643641.b911e2f1.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1585276059.882beb65/crmsh/ui_context.py
new/crmsh-4.2.0+git.1585643641.b911e2f1/crmsh/ui_context.py
--- old/crmsh-4.2.0+git.1585276059.882beb65/crmsh/ui_context.py 2020-03-27
03:27:39.0 +0100
+++ new/crmsh-4.2.0+git.1585643641.b911e2f1/crmsh/ui_context.py 2020-03-31
10:34:01.0 +0200
@@ -76,6 +76,9 @@
self.command_info = self.current_level().get_child(token)
if not self.command_info:
self.fatal_error("No such command")
+if self.command_name in self.command_info.aliases:
+common_warn("This command '{}' is deprecated, please use
'{}'"\
+.format(self.command_name, self.command_info.name))
self.command_name = self.command_info.name
if self.command_info.type == 'level':
self.enter_level(self.command_info.level)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1585276059.882beb65/crmsh/ui_resource.py
new/crmsh-4.2.0+git.1585643641.b911e2f1/crmsh/ui_resource.py
--- old/crmsh-4.2.0+git.1585276059.882beb65/crmsh/ui_resource.py
2020-03-27 03:27:39.0 +0100
+++ new/crmsh-4.2.0+git.1585643641.b911e2f1/crmsh/ui_resource.py
2020-03-31 10:34:01.0 +0200
@@ -604,7 +604,7 @@
rsc, cmd, attr, value)
@command.alias('reprobe')
-@command.completers(compl.nodes)
+@command.completers(compl.resources, compl.nodes)
def do_refresh(self, context, rsc=None, node=None, force=False):
'usage: refresh [] [] [force]'
return self._refresh_cleanup("refresh", rsc, node, force)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.2.0+git.1585276059.882beb65/doc/crm.8.adoc
new/crmsh-4.2.0+git.1585643641.b911e2f1/doc/crm.8.adoc
--- old/crmsh-4.2.0+git.1585276059.882beb65/doc/crm.8.adoc 2020-03-27
03:27:39.0 +0100
+++ new/crmsh-4.2.0+git.1585643641.b911e2f1/doc/crm.8.adoc 2020-03-31
10:34:01.0
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-03-27 21:57:41
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.3160 (New)
Package is "crmsh"
Fri Mar 27 21:57:41 2020 rev:180 rq:788734 version:4.2.0+git.1585276059.882beb65
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-03-25
23:47:24.256066504 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.3160/crmsh.changes2020-03-27
21:58:01.326818044 +0100
@@ -1,0 +2,7 @@
+Fri Mar 27 02:39:28 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1585276059.882beb65:
+ * Dev: behave: add functional test for geo cluster setup
+ * Low: bootstrap: Simplify bootstrap context
+
+---
Old:
crmsh-4.2.0+git.1585096577.f3257c89.tar.bz2
New:
crmsh-4.2.0+git.1585276059.882beb65.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.HPW1xA/_old 2020-03-27 21:58:02.778818889 +0100
+++ /var/tmp/diff_new_pack.HPW1xA/_new 2020-03-27 21:58:02.782818891 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1585096577.f3257c89
+Version:4.2.0+git.1585276059.882beb65
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.HPW1xA/_old 2020-03-27 21:58:02.838818924 +0100
+++ /var/tmp/diff_new_pack.HPW1xA/_new 2020-03-27 21:58:02.842818926 +0100
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- f3257c89ff67f53ee9bd78c8a91f7553000172ec
\ No newline at end of file
+ 25123c13b0eb32e24e39d87cce11b5267f95ebe7
\ No newline at end of file
++ crmsh-4.2.0+git.1585096577.f3257c89.tar.bz2 ->
crmsh-4.2.0+git.1585276059.882beb65.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.2.0+git.1585096577.f3257c89/.travis.yml
new/crmsh-4.2.0+git.1585276059.882beb65/.travis.yml
--- old/crmsh-4.2.0+git.1585096577.f3257c89/.travis.yml 2020-03-25
01:36:17.0 +0100
+++ new/crmsh-4.2.0+git.1585276059.882beb65/.travis.yml 2020-03-27
03:27:39.0 +0100
@@ -13,15 +13,16 @@
global:
-
CC_TEST_REPORTER_ID=a2579335b631ec35473874d7bb4fe983025c0287cea89c9dc34c35f98ee3963d
- FUNCTIONAL_TEST=$TRAVIS_BUILD_DIR/test/docker_scripts.sh
+- IMAGE=liangxin1300/hatbw
jobs:
include:
- stage: test
name: "unit test"
before_install:
-- docker pull liangxin1300/haleap:15.2
+- docker pull $IMAGE
script:
-- docker run -t -v "$(pwd):/app" liangxin1300/haleap:15.2 /bin/sh -c
"cd /app; TOXENV=py36-codeclimate; tox"
+- docker run -t -v "$(pwd):/app" $IMAGE /bin/sh -c "cd /app;
TOXENV=py38-codeclimate; tox"
- name: "original regression test"
before_script:
@@ -29,9 +30,9 @@
- chmod +x ./cc-test-reporter
- ./cc-test-reporter before-build
before_install:
-- docker pull liangxin1300/haleap:15.2
+- docker pull $IMAGE
script:
-- docker run -t -v "$(pwd):/app" liangxin1300/haleap:15.2 /bin/sh -c
"cd /app; ./test/run-in-travis.sh"
+- docker run -t -v "$(pwd):/app" $IMAGE /bin/sh -c "cd /app;
./test/run-in-travis.sh"
after_failure:
- sudo cat $TRAVIS_BUILD_DIR/crmtestout/regression.out
$TRAVIS_BUILD_DIR/crmtestout/crm.*
after_script:
@@ -55,6 +56,12 @@
script:
- $FUNCTIONAL_TEST bootstrap run options
+- name: "functional test for geo cluster"
+ before_install:
+- $FUNCTIONAL_TEST geo before_install
+ script:
+- $FUNCTIONAL_TEST geo run setup
+
- name: "functional test for qdevice - setup and remove"
before_install:
- $FUNCTIONAL_TEST qdevice before_install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1585096577.f3257c89/crmsh/bootstrap.py
new/crmsh-4.2.0+git.1585276059.882beb65/crmsh/bootstrap.py
--- old/crmsh-4.2.0+git.1585096577.f3257c89/crmsh/bootstrap.py 2020-03-25
01:36:17.0 +0100
+++ new/crmsh-4.2.0+git.1585276059.882beb65/crmsh/bootstrap.py 2020-03-27
03:27:39.0 +0100
@@ -50,27 +50,59 @@
Context object used to avoid having to pass these variables
to every bootstrap method.
"""
-def __init__(self, quiet, yes_to_all,
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-03-25 23:46:30
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.3160 (New)
Package is "crmsh"
Wed Mar 25 23:46:30 2020 rev:179 rq:787953 version:4.2.0+git.1585096577.f3257c89
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-03-19
19:52:30.408260566 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.3160/crmsh.changes2020-03-25
23:47:24.256066504 +0100
@@ -1,0 +2,9 @@
+Wed Mar 25 00:53:09 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1585096577.f3257c89:
+ * Dev: behave: Functional test for user case master survive
+ * Dev: unittest: unittest for qdevice improvement
+ * Dev: behave: functional test for qdevice imporvement
+ * Low: corosync: Improve qdevice configure process
+
+---
Old:
crmsh-4.2.0+git.1584623405.d39158a2.tar.bz2
New:
crmsh-4.2.0+git.1585096577.f3257c89.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.D3a6hg/_old 2020-03-25 23:47:26.776065836 +0100
+++ /var/tmp/diff_new_pack.D3a6hg/_new 2020-03-25 23:47:26.796065831 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1584623405.d39158a2
+Version:4.2.0+git.1585096577.f3257c89
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.D3a6hg/_old 2020-03-25 23:47:27.084065755 +0100
+++ /var/tmp/diff_new_pack.D3a6hg/_new 2020-03-25 23:47:27.104065750 +0100
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- 669f13b518847287d9994e8f3a00ffd876b376df
\ No newline at end of file
+ f3257c89ff67f53ee9bd78c8a91f7553000172ec
\ No newline at end of file
++ crmsh-4.2.0+git.1584623405.d39158a2.tar.bz2 ->
crmsh-4.2.0+git.1585096577.f3257c89.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.2.0+git.1584623405.d39158a2/.travis.yml
new/crmsh-4.2.0+git.1585096577.f3257c89/.travis.yml
--- old/crmsh-4.2.0+git.1584623405.d39158a2/.travis.yml 2020-03-19
14:10:05.0 +0100
+++ new/crmsh-4.2.0+git.1585096577.f3257c89/.travis.yml 2020-03-25
01:36:17.0 +0100
@@ -72,6 +72,12 @@
- $FUNCTIONAL_TEST qdevice before_install
script:
- $FUNCTIONAL_TEST qdevice run validate
+
+- name: "functional test for qdevice - user case"
+ before_install:
+- $FUNCTIONAL_TEST qdevice before_install
+ script:
+- $FUNCTIONAL_TEST qdevice run usercase
- name: "functional test for resource subcommand"
before_install:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1584623405.d39158a2/crmsh/corosync.py
new/crmsh-4.2.0+git.1585096577.f3257c89/crmsh/corosync.py
--- old/crmsh-4.2.0+git.1584623405.d39158a2/crmsh/corosync.py 2020-03-19
14:10:05.0 +0100
+++ new/crmsh-4.2.0+git.1585096577.f3257c89/crmsh/corosync.py 2020-03-25
01:36:17.0 +0100
@@ -89,8 +89,8 @@
qdevice_path = "/etc/corosync/qdevice/net"
qdevice_db_path = "/etc/corosync/qdevice/net/nssdb"
-def __init__(self, ip, port=5403, algo="ffsplit",
- tie_breaker="lowest", tls="on", cluster_node=None, cmds=None):
+def __init__(self, ip, port=5403, algo="ffsplit", tie_breaker="lowest",
+tls="on", cluster_node=None, cmds=None, mode=None):
self.ip = ip
self.port = port
self.algo = algo
@@ -99,6 +99,7 @@
self.cluster_node = cluster_node
self.askpass = False
self.cmds = cmds
+self.mode = mode
@property
def qnetd_cacert_on_qnetd(self):
@@ -137,6 +138,8 @@
return "{}/{}/{}".format(self.qdevice_path, self.cluster_node,
self.qdevice_p12_filename)
def valid_attr(self):
+if not bootstrap.package_is_installed("corosync-qdevice"):
+raise ValueError("Package \"corosync-qdevice\" not installed on
this node")
if self.ip == utils.this_node() or self.ip in utils.ip_in_local():
raise ValueError("host for qnetd must be a remote one")
if not utils.resolve_hostnames([self.ip])[0]:
@@ -145,24 +148,31 @@
raise ValueError("ssh service on \"{}\" not
available".format(self.ip))
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-03-19 19:49:02
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.3160 (New)
Package is "crmsh"
Thu Mar 19 19:49:02 2020 rev:178 rq:786479 version:4.2.0+git.1584623405.d39158a2
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-03-17
13:09:29.813769092 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.3160/crmsh.changes2020-03-19
19:52:30.408260566 +0100
@@ -1,0 +2,12 @@
+Thu Mar 19 13:19:38 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1584623405.d39158a2:
+ * Fix: bootstrap: Change condition to add stonith-sbd resource(bsc#1166967)
+
+---
+Wed Mar 18 10:53:30 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1584528254.371d05b1:
+ * Dev: bootstrap: binding interface when calling "crm cluster init"
+
+---
Old:
crmsh-4.2.0+git.1584360067.097e3790.tar.bz2
New:
crmsh-4.2.0+git.1584623405.d39158a2.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.1XL8u2/_old 2020-03-19 19:52:31.864261406 +0100
+++ /var/tmp/diff_new_pack.1XL8u2/_new 2020-03-19 19:52:31.884261418 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1584360067.097e3790
+Version:4.2.0+git.1584623405.d39158a2
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.1XL8u2/_old 2020-03-19 19:52:31.956261460 +0100
+++ /var/tmp/diff_new_pack.1XL8u2/_new 2020-03-19 19:52:31.956261460 +0100
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- 2c10d3df8de68a2df4e2f3ada933528ddba22b1e
\ No newline at end of file
+ 669f13b518847287d9994e8f3a00ffd876b376df
\ No newline at end of file
++ crmsh-4.2.0+git.1584360067.097e3790.tar.bz2 ->
crmsh-4.2.0+git.1584623405.d39158a2.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1584360067.097e3790/crmsh/bootstrap.py
new/crmsh-4.2.0+git.1584623405.d39158a2/crmsh/bootstrap.py
--- old/crmsh-4.2.0+git.1584360067.097e3790/crmsh/bootstrap.py 2020-03-16
13:01:07.0 +0100
+++ new/crmsh-4.2.0+git.1584623405.d39158a2/crmsh/bootstrap.py 2020-03-19
14:10:05.0 +0100
@@ -660,7 +660,7 @@
# for cluster join, diskless_sbd flag is set in join_cluster() if
# sbd is running on seed host
-if configured_sbd_device() or _context.diskless_sbd:
+if (configured_sbd_device() and _context.sbd_device) or
_context.diskless_sbd:
invoke("systemctl enable sbd.service")
else:
invoke("systemctl disable sbd.service")
@@ -1496,7 +1496,7 @@
rsc_defaults rsc-options: resource-stickiness=1 migration-threshold=3
""")
-if configured_sbd_device():
+if configured_sbd_device() and _context.sbd_device:
if not invoke("crm configure primitive stonith-sbd
stonith:external/sbd pcmk_delay_max=30s"):
error("Can't create stonith-sbd primitive")
if not invoke("crm configure property stonith-enabled=true"):
@@ -1702,8 +1702,8 @@
# authorized_keys file (again, to help with the case where the
# user has done manual initial setup without the assistance of
# ha-cluster-init).
-if not invoke("ssh root@%s crm cluster init ssh_remote" % (seed_host)):
-error("Can't invoke crm cluster init ssh_remote on %s" % (seed_host))
+if not invoke("ssh root@{} crm cluster init -i {}
ssh_remote".format(seed_host, _context.nic)):
+error("Can't invoke crm cluster init -i {} ssh_remote on
{}".format(_context.nic, seed_host))
def join_csync2(seed_host):
@@ -1724,8 +1724,8 @@
# If we *were* updating /etc/hosts, the next line would have
"\"$hosts_line\"" as
# the last arg (but this requires re-enabling this functionality in
ha-cluster-init)
-if not invoke("ssh -o StrictHostKeyChecking=no root@{} crm cluster init
csync2_remote {}".format(seed_host, utils.this_node())):
-error("Can't invoke crm cluster init init csync2_remote on
{}".format(seed_host))
+if not invoke("ssh -o StrictHostKeyChecking=no root@{} crm cluster init -i
{} csync2_remote {}".format(seed_host, _context.nic, utils.this_node())):
+error("Can't
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-03-17 13:09:27
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.3160 (New)
Package is "crmsh"
Tue Mar 17 13:09:27 2020 rev:177 rq:785611 version:4.2.0+git.1584360067.097e3790
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-03-12
23:12:36.615331124 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.3160/crmsh.changes2020-03-17
13:09:29.813769092 +0100
@@ -1,0 +2,8 @@
+Mon Mar 16 12:10:14 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1584360067.097e3790:
+ * Dev: unittest: unit test for changed function csync2_update
+ * Dev: behave: functional test for scenarios of bsc#1166684
+ * Fix: bootstrap: use csync2 '-f' option correctly(bsc#1166684)
+
+---
Old:
crmsh-4.2.0+git.1584013187.b45cfcb6.tar.bz2
New:
crmsh-4.2.0+git.1584360067.097e3790.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.4U2mnO/_old 2020-03-17 13:09:30.437769572 +0100
+++ /var/tmp/diff_new_pack.4U2mnO/_new 2020-03-17 13:09:30.441769574 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1584013187.b45cfcb6
+Version:4.2.0+git.1584360067.097e3790
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.4U2mnO/_old 2020-03-17 13:09:30.469769596 +0100
+++ /var/tmp/diff_new_pack.4U2mnO/_new 2020-03-17 13:09:30.473769599 +0100
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- b256772e34cde162c8245581097d13070ae51254
\ No newline at end of file
+ 2c10d3df8de68a2df4e2f3ada933528ddba22b1e
\ No newline at end of file
++ crmsh-4.2.0+git.1584013187.b45cfcb6.tar.bz2 ->
crmsh-4.2.0+git.1584360067.097e3790.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1584013187.b45cfcb6/crmsh/bootstrap.py
new/crmsh-4.2.0+git.1584360067.097e3790/crmsh/bootstrap.py
--- old/crmsh-4.2.0+git.1584013187.b45cfcb6/crmsh/bootstrap.py 2020-03-12
12:39:47.0 +0100
+++ new/crmsh-4.2.0+git.1584360067.097e3790/crmsh/bootstrap.py 2020-03-16
13:01:07.0 +0100
@@ -784,9 +784,17 @@
def csync2_update(path):
-invoke("csync2 -rm %s" % (path))
-invoke("csync2 -rf %s" % (path))
-invoke("csync2 -rxv %s" % (path))
+'''
+Sync path to all peers
+
+If there was a conflict, use '-f' to force this side to win
+'''
+invoke("csync2 -rm {}".format(path))
+if invoke("csync2 -rxv {}".format(path)):
+return
+invoke("csync2 -rf {}".format(path))
+if not invoke("csync2 -rxv {}".format(path)):
+warn("{} was not synced".format(path))
def init_csync2_remote():
@@ -1740,7 +1748,7 @@
# they haven't gone to all nodes in the cluster, which means a
# subseqent join of another node can fail its sync of corosync.conf
# when it updates expected_votes. Grrr...
-if not invoke('ssh -o StrictHostKeyChecking=no root@%s "csync2 -mr / ;
csync2 -fr / ; csync2 -xv"' % (seed_host)):
+if not invoke('ssh -o StrictHostKeyChecking=no root@{} "csync2 -rm /;
csync2 -rxv || csync2 -rf / && csync2 -rxv"'.format(seed_host)):
print("")
warn("csync2 run failed - some files may not be sync'd")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1584013187.b45cfcb6/test/docker_scripts.sh
new/crmsh-4.2.0+git.1584360067.097e3790/test/docker_scripts.sh
--- old/crmsh-4.2.0+git.1584013187.b45cfcb6/test/docker_scripts.sh
2020-03-12 12:39:47.0 +0100
+++ new/crmsh-4.2.0+git.1584360067.097e3790/test/docker_scripts.sh
2020-03-16 13:01:07.0 +0100
@@ -36,7 +36,7 @@
docker run -d --name=qnetd-node --hostname qnetd-node \
--privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro ${Docker_image}
docker network connect --ip=10.10.10.9 second_net qnetd-node
-docker exec -t qnetd-node /bin/sh -c "zypper -n in corosync-qnetd"
+docker exec -t qnetd-node /bin/sh -c "zypper ref;zypper -n in
corosync-qnetd"
docker exec -t qnetd-node /bin/sh -c "systemctl start sshd.service"
# deploy node without ssh.service running for validation
diff -urN '--exclude=CVS'
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-03-12 23:08:28
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.3160 (New)
Package is "crmsh"
Thu Mar 12 23:08:28 2020 rev:176 rq:784339 version:4.2.0+git.1584013187.b45cfcb6
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-03-07
21:42:14.34290 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.3160/crmsh.changes2020-03-12
23:12:36.615331124 +0100
@@ -1,0 +2,8 @@
+Thu Mar 12 11:48:43 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1584013187.b45cfcb6:
+ * Low: setup.py: update crmsh's version
+ * Fix: crmsh.spec.in: enable completion of crm command(bsc#1166329)
+ * Low: crmsh.spec.in: sync contents from NHF's crmsh.spec file
+
+---
Old:
crmsh-4.2.0+git.1583246906.f09ab45e.tar.bz2
New:
crmsh-4.2.0+git.1584013187.b45cfcb6.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.d3fysf/_old 2020-03-12 23:12:37.075331305 +0100
+++ /var/tmp/diff_new_pack.d3fysf/_new 2020-03-12 23:12:37.083331309 +0100
@@ -1,7 +1,7 @@
#
# spec file for package crmsh
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1583246906.f09ab45e
+Version:4.2.0+git.1584013187.b45cfcb6
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
@@ -106,7 +106,7 @@
Requires(post): mailx
Requires(post): procps
Requires(post): python3-python-dateutil
-Requires(post): python3-nose
+Requires(post): python3-tox
Requires(post): python3-parallax
Requires(post): pacemaker
%if 0%{?suse_version} > 1110
@@ -160,7 +160,7 @@
make %{_smp_mflags} VERSION="%{version}" sysconfdir=%{_sysconfdir}
localstatedir=%{_var}
%if %{with regression_tests}
-./test/run --quiet
+tox
if [ ! $? ]; then
echo "Unit tests failed."
exit 1
@@ -169,7 +169,7 @@
%install
make DESTDIR=%{buildroot} docdir=%{crmsh_docdir} install
-install -Dm0644 contrib/bash_completion.sh
%{buildroot}%{_datadir}/bash-completion/completions/crm.sh
+install -Dm0644 contrib/bash_completion.sh
%{buildroot}%{_datadir}/bash-completion/completions/crm
if [ -f %{buildroot}%{_bindir}/crm ]; then
install -Dm0755 %{buildroot}%{_bindir}/crm %{buildroot}%{_sbindir}/crm
rm %{buildroot}%{_bindir}/crm
@@ -182,7 +182,7 @@
# Run regression tests after installing the package
# NB: this is called twice by OBS, that's why we touch the file
%post test
-testfile=/tmp/.crmsh_regression_tests_ran
+testfile=`mktemp -t .crmsh_regression_tests_ran_XX`
# check if time in file is less than 2 minutes ago
if [ -e $testfile ] && [ "$(( $(date +%s) - $(cat $testfile) ))" -lt 120 ];
then
echo "Skipping regression tests..."
@@ -226,7 +226,7 @@
%dir %{crmsh_docdir}
%dir %{crmsh_docdir}/contrib
%dir %attr (770, %{uname}, %{gname}) %{_var}/cache/crm
-%{_datadir}/bash-completion/completions/crm.sh
+%{_datadir}/bash-completion/completions/crm
%files scripts
%defattr(-,root,root)
++ _servicedata ++
--- /var/tmp/diff_new_pack.d3fysf/_old 2020-03-12 23:12:37.123331325 +0100
+++ /var/tmp/diff_new_pack.d3fysf/_new 2020-03-12 23:12:37.123331325 +0100
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- e10e5eb673d963a8bbd83c1c1b338ae01bc8e33a
\ No newline at end of file
+ b256772e34cde162c8245581097d13070ae51254
\ No newline at end of file
++ crmsh-4.2.0+git.1583246906.f09ab45e.tar.bz2 ->
crmsh-4.2.0+git.1584013187.b45cfcb6.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.2.0+git.1583246906.f09ab45e/configure.ac
new/crmsh-4.2.0+git.1584013187.b45cfcb6/configure.ac
--- old/crmsh-4.2.0+git.1583246906.f09ab45e/configure.ac2020-03-03
15:48:26.0 +0100
+++ new/crmsh-4.2.0+git.1584013187.b45cfcb6/configure.ac2020-03-12
12:39:47.0 +0100
@@ -8,7 +8,7 @@
AC_PREREQ([2.53])
-AC_INIT([crmsh],[4.0.0],[us...@clusterlabs.org])
+AC_INIT([crmsh],[4.2.0],[us...@clusterlabs.org])
AC_ARG_WITH(version,
[
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-03-07 21:41:54
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.26092 (New)
Package is "crmsh"
Sat Mar 7 21:41:54 2020 rev:175 rq:782541 version:4.2.0+git.1583246906.f09ab45e
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-02-18
13:29:26.480706709 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.26092/crmsh.changes 2020-03-07
21:42:14.34290 +0100
@@ -1,0 +2,6 @@
+Tue Mar 03 15:03:45 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1583246906.f09ab45e:
+ * Dev: testcases: update test output due to pacemaker update
+
+---
Old:
crmsh-4.2.0+git.1581993539.5a1deb03.tar.bz2
New:
crmsh-4.2.0+git.1583246906.f09ab45e.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.wds97J/_old 2020-03-07 21:42:15.288434859 +0100
+++ /var/tmp/diff_new_pack.wds97J/_new 2020-03-07 21:42:15.288434859 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1581993539.5a1deb03
+Version:4.2.0+git.1583246906.f09ab45e
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.wds97J/_old 2020-03-07 21:42:15.320434882 +0100
+++ /var/tmp/diff_new_pack.wds97J/_new 2020-03-07 21:42:15.320434882 +0100
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- e2a36e872463a85806255adc08396883b53a
\ No newline at end of file
+ e10e5eb673d963a8bbd83c1c1b338ae01bc8e33a
\ No newline at end of file
++ crmsh-4.2.0+git.1581993539.5a1deb03.tar.bz2 ->
crmsh-4.2.0+git.1583246906.f09ab45e.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1581993539.5a1deb03/test/testcases/ra.exp
new/crmsh-4.2.0+git.1583246906.f09ab45e/test/testcases/ra.exp
--- old/crmsh-4.2.0+git.1581993539.5a1deb03/test/testcases/ra.exp
2020-02-18 03:38:59.0 +0100
+++ new/crmsh-4.2.0+git.1583246906.f09ab45e/test/testcases/ra.exp
2020-03-03 15:48:26.0 +0100
@@ -9,16 +9,10 @@
.EXT crm_resource --show-metadata ocf:pacemaker:Dummy
Example stateless resource agent (ocf:pacemaker:Dummy)
-This is a Dummy Resource Agent. It does absolutely nothing except
-keep track of whether its running or not.
-Its purpose in life is for testing and to serve as a template for RA writers.
-
-NB: Please pay attention to the timeouts specified in the actions
-section below. They should be meaningful for the kind of resource
-the agent manages. They should be the minimum advised timeouts,
-but they shouldn't/cannot cover _all_ possible resource
-instances. So, try to be neither overly generous nor too stingy,
-but moderate. The minimum timeouts should never be below 10 seconds.
+This is a dummy OCF resource agent. It does absolutely nothing except keep
track
+of whether it is running or not, and can be configured so that actions fail or
+take a long time. Its purpose is primarily for testing, and to serve as a
+template for resource agent writers.
Parameters (*: required, []: default):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1581993539.5a1deb03/test/testcases/resource.exp
new/crmsh-4.2.0+git.1583246906.f09ab45e/test/testcases/resource.exp
--- old/crmsh-4.2.0+git.1581993539.5a1deb03/test/testcases/resource.exp
2020-02-18 03:38:59.0 +0100
+++ new/crmsh-4.2.0+git.1583246906.f09ab45e/test/testcases/resource.exp
2020-03-03 15:48:26.0 +0100
@@ -914,7 +914,7 @@
.TRY configure ms msg g
.TRY resource scores
.EXT crm_simulate -sUL
-3 of 6 resources DISABLED and 0 BLOCKED from being started due to failures
+2 of 6 resource instances DISABLED and 0 BLOCKED from further action due to
failure
Current cluster status:
Node node1: UNCLEAN (offline)
@@ -930,24 +930,24 @@
Allocation scores and utilization information:
Original: node1 capacity:
-native_color: st allocation score on node1: 0
-clone_color: c1 allocation score on node1: 0
-clone_color: p1:0 allocation score on node1: 0
-native_color: p1:0 allocation score on node1: -INFINITY
-clone_color: m1 allocation score on node1: 0
-clone_color: p2:0 allocation score on node1: 0
-native_color: p2:0 allocation score on
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-02-18 13:29:25
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.26092 (New)
Package is "crmsh"
Tue Feb 18 13:29:25 2020 rev:174 rq:775026 version:4.2.0+git.1581993539.5a1deb03
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-02-03
11:16:24.629938705 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.26092/crmsh.changes 2020-02-18
13:29:26.480706709 +0100
@@ -1,0 +2,10 @@
+Tue Feb 18 02:53:29 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1581993539.5a1deb03:
+ * Dev: behave: functional test for setup cluster with crossed network
+ * Dev: unittest: test for get_peer_hostname/is_online/find_configured_ip
functions
+ * Dev: corosync: check whether local ip has already configured
+ * Dev: bootstrap: check whether init node is online while joining
+ * Dev: bootstrap: for udpu, don't check join node's ip was in the same
network
+
+---
Old:
crmsh-4.2.0+git.1580544897.c42c9530.tar.bz2
New:
crmsh-4.2.0+git.1581993539.5a1deb03.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.2egUa9/_old 2020-02-18 13:29:27.540708771 +0100
+++ /var/tmp/diff_new_pack.2egUa9/_new 2020-02-18 13:29:27.548708786 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1580544897.c42c9530
+Version:4.2.0+git.1581993539.5a1deb03
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.2egUa9/_old 2020-02-18 13:29:27.608708902 +0100
+++ /var/tmp/diff_new_pack.2egUa9/_new 2020-02-18 13:29:27.608708902 +0100
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- a8fc76646a14dfcf7b34e62303d2195ef96c3daa
\ No newline at end of file
+ e2a36e872463a85806255adc08396883b53a
\ No newline at end of file
++ crmsh-4.2.0+git.1580544897.c42c9530.tar.bz2 ->
crmsh-4.2.0+git.1581993539.5a1deb03.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1580544897.c42c9530/crmsh/bootstrap.py
new/crmsh-4.2.0+git.1581993539.5a1deb03/crmsh/bootstrap.py
--- old/crmsh-4.2.0+git.1580544897.c42c9530/crmsh/bootstrap.py 2020-02-01
09:14:57.0 +0100
+++ new/crmsh-4.2.0+git.1581993539.5a1deb03/crmsh/bootstrap.py 2020-02-18
03:38:59.0 +0100
@@ -18,6 +18,7 @@
import re
import time
import readline
+import shutil
from string import Template
from lxml import etree
from . import config
@@ -38,6 +39,7 @@
SYSCONFIG_FW = "/etc/sysconfig/SuSEfirewall2"
SYSCONFIG_FW_CLUSTER = "/etc/sysconfig/SuSEfirewall2.d/services/cluster"
PCMK_REMOTE_AUTH = "/etc/pacemaker/authkey"
+COROSYNC_CONF_ORIG = tmpfiles.create()[1]
INIT_STAGES = ("ssh", "ssh_remote", "csync2", "csync2_remote", "corosync",
"storage", "sbd", "cluster", "vgfs", "admin", "qdevice")
@@ -228,13 +230,53 @@
status_long("Waiting for cluster")
while True:
_rc, out, _err = utils.get_stdout_stderr("crm_mon -1")
-if "online" in out.lower():
+if is_online(out):
break
status_progress()
-sleep(5)
+sleep(2)
status_done()
+def get_cluster_node_hostname():
+"""
+Get the hostname of the cluster node used during the join process if an IP
address is used.
+"""
+peer_node = None
+if _context.cluster_node:
+if utils.valid_ip_addr(_context.cluster_node):
+rc, out, err = utils.get_stdout_stderr("ssh {} crm_node
--name".format(_context.cluster_node))
+if rc != 0:
+error(err)
+peer_node = out
+else:
+peer_node = _context.cluster_node
+return peer_node
+
+
+def is_online(crm_mon_txt):
+"""
+Check whether local node is online
+Besides that, in join process, check whether init node is online
+"""
+if not re.search("Online: .* {} ".format(utils.this_node()), crm_mon_txt):
+return False
+
+# if peer_node is None, this is in the init process
+peer_node = get_cluster_node_hostname()
+if peer_node is None:
+return True
+# In join process
+# If the joining node is already online but can't find the init node
+# The communication IP maybe mis-configured
+if
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-02-03 11:15:59
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.26092 (New)
Package is "crmsh"
Mon Feb 3 11:15:59 2020 rev:173 rq:769408 version:4.2.0+git.1580544897.c42c9530
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-01-17
16:07:24.520497424 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.26092/crmsh.changes 2020-02-03
11:16:24.629938705 +0100
@@ -1,0 +2,34 @@
+Sat Feb 01 08:28:52 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1580544897.c42c9530:
+ * Low: unittest: add unit test to detect_cloud
+
+---
+Fri Jan 31 11:01:45 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1580467952.1931808d:
+ * Low: utils: update detect_cloud pattern for aws
+
+---
+Wed Jan 29 02:15:11 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1580263559.a2b0f500:
+ * scripts: python3.8 unittest compatibility
+
+---
+Wed Jan 22 06:02:01 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1579603179.bf924b8b:
+ * Low: testcases: adjust testcases based on related upstream version
+ * Low: unittest: replace nose with pytest
+ * Low: replace configparser.SafeConfigParser as configparser.ConfigParser
+
+---
+Mon Jan 20 11:04:22 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1579517638.06d53d8a:
+ * Low: doc: update configure.set documentation
+ * Low: behave: functional test for configure.set subcommand
+ * Feature: configure: make configure.set to update operation
+
+---
Old:
crmsh-4.2.0+git.1578911004.c1a33535.tar.bz2
New:
crmsh-4.2.0+git.1580544897.c42c9530.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.eWXNwr/_old 2020-02-03 11:16:25.957939376 +0100
+++ /var/tmp/diff_new_pack.eWXNwr/_new 2020-02-03 11:16:25.981939389 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1578911004.c1a33535
+Version:4.2.0+git.1580544897.c42c9530
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.eWXNwr/_old 2020-02-03 11:16:26.153939476 +0100
+++ /var/tmp/diff_new_pack.eWXNwr/_new 2020-02-03 11:16:26.157939477 +0100
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- c1a33535c73acf9ebd41e4e2b30731b7b90f9db0
\ No newline at end of file
+ a8fc76646a14dfcf7b34e62303d2195ef96c3daa
\ No newline at end of file
++ crmsh-4.2.0+git.1578911004.c1a33535.tar.bz2 ->
crmsh-4.2.0+git.1580544897.c42c9530.tar.bz2 ++
2567 lines of diff (skipped)
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-01-17 16:06:36
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.26092 (New)
Package is "crmsh"
Fri Jan 17 16:06:36 2020 rev:172 rq:765101 version:4.2.0+git.1578911004.c1a33535
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2020-01-07
23:53:51.752047166 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.26092/crmsh.changes 2020-01-17
16:07:24.520497424 +0100
@@ -1,0 +2,35 @@
+Mon Jan 13 10:32:18 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1578911004.c1a33535:
+ * Dev: behave: Not allowed space value for option
+ * Fix: ui_cluster: Not allowed space value for option (bsc#1141976)
+
+---
+Fri Jan 10 08:51:14 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1578645670.4df2f015:
+ * Dev: unittest: add unit test for dump_D_process function
+ * Fix: hb_report: disable dump all tasks stack into dmesg(bsc#1158060)
+
+---
+Fri Jan 10 07:41:56 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1578641542.ddda681c:
+ * Dev: behave: varify help output for commands which replace as argparse
+ * Dev: replace optparse with argparse
+
+---
+Tue Jan 07 12:39:32 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1578400179.830baba1:
+ * Dev: unittest: remove "placement-strategy=balanced" in ut codes
+ * Dev: behave: test placement-strategy value is "default"
+ * Fix: bootstrap: set placement-strategy value as "default"(bsc#1129462)
+
+---
+Tue Jan 07 09:34:24 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1578389070.fb171448:
+ * Fix: crmsh.spec: using mktemp to create tmp file(bsc#1154163)
+
+---
Old:
crmsh-4.2.0+git.1578387778.867a085b.tar.bz2
New:
crmsh-4.2.0+git.1578911004.c1a33535.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.7mdbdW/_old 2020-01-17 16:07:25.348497816 +0100
+++ /var/tmp/diff_new_pack.7mdbdW/_new 2020-01-17 16:07:25.352497818 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1578387778.867a085b
+Version:4.2.0+git.1578911004.c1a33535
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.7mdbdW/_old 2020-01-17 16:07:25.380497831 +0100
+++ /var/tmp/diff_new_pack.7mdbdW/_new 2020-01-17 16:07:25.380497831 +0100
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- 867a085b5d7e710060d7381cd34c4634760c2462
\ No newline at end of file
+ c1a33535c73acf9ebd41e4e2b30731b7b90f9db0
\ No newline at end of file
++ crmsh-4.2.0+git.1578387778.867a085b.tar.bz2 ->
crmsh-4.2.0+git.1578911004.c1a33535.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.2.0+git.1578387778.867a085b/.travis.yml
new/crmsh-4.2.0+git.1578911004.c1a33535/.travis.yml
--- old/crmsh-4.2.0+git.1578387778.867a085b/.travis.yml 2020-01-07
10:02:58.0 +0100
+++ new/crmsh-4.2.0+git.1578911004.c1a33535/.travis.yml 2020-01-13
11:23:24.0 +0100
@@ -34,7 +34,13 @@
after_script:
- ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
-
+
+- name: "regression test for bootstrap bugs"
+ before_install:
+- $FUNCTIONAL_TEST bootstrap before_install
+ script:
+- $FUNCTIONAL_TEST bootstrap run bugs
+
- name: "functional test for bootstrap - init, join and remove"
before_install:
- $FUNCTIONAL_TEST bootstrap before_install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1578387778.867a085b/crmsh/bootstrap.py
new/crmsh-4.2.0+git.1578911004.c1a33535/crmsh/bootstrap.py
--- old/crmsh-4.2.0+git.1578387778.867a085b/crmsh/bootstrap.py 2020-01-07
10:02:58.0 +0100
+++ new/crmsh-4.2.0+git.1578911004.c1a33535/crmsh/bootstrap.py 2020-01-13
11:23:24.0 +0100
@@ -1441,7 +1441,7 @@
status("Loading initial cluster configuration")
crm_configure_load("update", """
-property
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2020-01-07 23:53:20
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.6675 (New)
Package is "crmsh"
Tue Jan 7 23:53:20 2020 rev:171 rq:761367 version:4.2.0+git.1578387778.867a085b
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2019-12-24
14:30:55.934604182 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.6675/crmsh.changes2020-01-07
23:53:51.752047166 +0100
@@ -1,0 +2,13 @@
+Tue Jan 07 09:13:02 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1578387778.867a085b:
+ * Dev: bootstrap: Maximum number of SBD device is 3
+ * Dev: bootstrap: improve multi disk sbd usability support both '-s device1
-s device2' and '-s "device1;device2"' improve the logic of code
+
+---
+Fri Jan 03 06:04:25 UTC 2020 - xli...@suse.com
+
+- Update to version 4.2.0+git.1578030883.465b4212:
+ * dev: unittest: fix test_report.py failing in 2020
+
+---
Old:
crmsh-4.2.0+git.1577086871.f544180c.tar.bz2
New:
crmsh-4.2.0+git.1578387778.867a085b.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.EDoXw0/_old 2020-01-07 23:53:52.620047616 +0100
+++ /var/tmp/diff_new_pack.EDoXw0/_new 2020-01-07 23:53:52.624047618 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.2.0+git.1577086871.f544180c
+Version:4.2.0+git.1578387778.867a085b
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.EDoXw0/_old 2020-01-07 23:53:52.724047670 +0100
+++ /var/tmp/diff_new_pack.EDoXw0/_new 2020-01-07 23:53:52.740047678 +0100
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- d10d2fbdd1b357500387bebb432c68e88748526b
\ No newline at end of file
+ 867a085b5d7e710060d7381cd34c4634760c2462
\ No newline at end of file
++ crmsh-4.2.0+git.1577086871.f544180c.tar.bz2 ->
crmsh-4.2.0+git.1578387778.867a085b.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.2.0+git.1577086871.f544180c/crmsh/bootstrap.py
new/crmsh-4.2.0+git.1578387778.867a085b/crmsh/bootstrap.py
--- old/crmsh-4.2.0+git.1577086871.f544180c/crmsh/bootstrap.py 2019-12-23
08:41:11.0 +0100
+++ new/crmsh-4.2.0+git.1578387778.867a085b/crmsh/bootstrap.py 2020-01-07
10:02:58.0 +0100
@@ -1321,10 +1321,29 @@
SBD can also run in diskless mode if no device
is configured.
"""
-if not _context.sbd_device and _context.diskless_sbd:
+def get_dev_list(dev_list):
+result_list = []
+for dev in dev_list:
+if ';' in dev:
+result_list.extend(dev.strip(';').split(';'))
+else:
+result_list.append(dev)
+return result_list
+
+# non-interactive case
+if _context.sbd_device:
+_context.sbd_device = get_dev_list(_context.sbd_device)
+if len(_context.sbd_device) > 3:
+error("Maximum number of SBD device is 3")
+for dev in _context.sbd_device:
+if not is_block_device(dev):
+error("{} doesn't look like a block device".format(dev))
+# diskless sbd
+elif _context.diskless_sbd:
init_sbd_diskless()
return
-elif not _context.sbd_device:
+# interactive case
+else:
# SBD device not set up by init_storage (ocfs2 template) and
# also not passed in as command line argument - prompt user
if _context.yes_to_all:
@@ -1370,9 +1389,12 @@
init_sbd_diskless()
return
dev_list = dev.strip(';').split(';')
+if len(dev_list) > 3:
+error("Maximum number of SBD device is 3")
+continue
for dev_item in dev_list:
if not is_block_device(dev_item):
-print("{} doesn't look like a block
device".format(dev_item), file=sys.stderr)
+error("{} doesn't look like a block
device".format(dev_item))
dev_looks_sane = False
break
else:
@@ -1385,10 +1407,6 @@
_context.sbd_device = dev_list
-for dev in _context.sbd_device:
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2019-12-24 14:30:35
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.6675 (New)
Package is "crmsh"
Tue Dec 24 14:30:35 2019 rev:170 rq:759059 version:4.2.0+git.1577086871.f544180c
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2019-12-16
15:20:28.531136492 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.6675/crmsh.changes2019-12-24
14:30:55.934604182 +0100
@@ -1,0 +2,6 @@
+Mon Dec 23 07:50:47 UTC 2019 - xli...@suse.com
+
+- Update to version 4.2.0+git.1577086871.f544180c:
+ * Update ChangeLog for 4.2.0
+
+---
Old:
crmsh-4.1.0+git.1576228931.ae559358.tar.bz2
New:
crmsh-4.2.0+git.1577086871.f544180c.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.QOfzIP/_old 2019-12-24 14:30:56.706604574 +0100
+++ /var/tmp/diff_new_pack.QOfzIP/_new 2019-12-24 14:30:56.710604576 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.1.0+git.1576228931.ae559358
+Version:4.2.0+git.1577086871.f544180c
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _service ++
--- /var/tmp/diff_new_pack.QOfzIP/_old 2019-12-24 14:30:56.730604586 +0100
+++ /var/tmp/diff_new_pack.QOfzIP/_new 2019-12-24 14:30:56.730604586 +0100
@@ -3,7 +3,7 @@
https://github.com/ClusterLabs/crmsh.git
git
crmsh
-4.1.0+git.%ct.%h
+4.2.0+git.%ct.%h
master
enable
++ _servicedata ++
--- /var/tmp/diff_new_pack.QOfzIP/_old 2019-12-24 14:30:56.746604595 +0100
+++ /var/tmp/diff_new_pack.QOfzIP/_new 2019-12-24 14:30:56.746604595 +0100
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- ae559358d1933de123c43a2f86d2d588810d8045
\ No newline at end of file
+ d10d2fbdd1b357500387bebb432c68e88748526b
\ No newline at end of file
++ crmsh-4.1.0+git.1576228931.ae559358.tar.bz2 ->
crmsh-4.2.0+git.1577086871.f544180c.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.1.0+git.1576228931.ae559358/ChangeLog
new/crmsh-4.2.0+git.1577086871.f544180c/ChangeLog
--- old/crmsh-4.1.0+git.1576228931.ae559358/ChangeLog 2019-12-13
10:22:11.0 +0100
+++ new/crmsh-4.2.0+git.1577086871.f544180c/ChangeLog 2019-12-23
08:41:11.0 +0100
@@ -1,3 +1,63 @@
+* Mon Dec 23 2019 Xin Liang and many others
+- Release 4.2.0
+- Merge pull request #464 from liangxin1300/2019_crmsh_qdevice_qnetd
+- Low: ui_cluster: replace --qdevice as --qnetd-hostname
+- Low: corosync: add log and debug messages on each certificate steps
+- Low: ui_cluster: change qdevice related option's help message
+- Low: bootstrap: support qdevice heuristics
+- Low: bootstrap: start qdevice/qnetd service when not overwrite configuration
+- Low: ui_corosync: improve corosync status sub-command
+- Low: bootstrap: when removing qdevice, remove qdevice database
+- Low: bootstrap: qdevice certification process when cluster join
+- Low: ui_cluster: change option info for qdevice/qnetd
+- Low: bootstrap: qdevice certification process when cluster init
+- Low: bootstrap: interface for removing qdevice
+- Low: corosync: check tie-breaker is a valid nodeid
+- Low: bootstrap: improve init_qdevice function
+- Low: bootstrap: write qdevice config section when configuring qdevice in
stage
+- Low: bootstrap: adjust corosync configuration for qdevice
+- Low: bootstrap: make qdevice process as a bootstrap stage
+- Low: bootstrap: manage qnetd node
+- Low: bootstrap: valid qdevice parameters
+- Merge pull request #483 from liangxin1300/20191105_python_behave
+- Merge pull request #484 from liangxin1300/20191112_nose_verbose
+- Merge pull request #482 from liangxin1300/20191101_parallax_functions
+- Low: parallax: create class Parallax to simplify using parallax
+- Merge pull request #480 from aleksei-burlakov/config-do_property
+- Doc: ui_configure: do_property: ask to remove maintenance from resources and
nodes
+- Low: ui_configure: do_property: ask to remove maintenance from resources and
nodes
+- Merge pull request #476 from liangxin1300/20191011_ssh_key
+- Merge pull request #478 from aleksei-burlakov/node-do_maintenance
+- Doc: ui_node: do_maintenance: ask to remove maintenance attr from primitives
+- Low: ui_node: do_maintenance:
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2019-12-16 15:20:21
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.4691 (New)
Package is "crmsh"
Mon Dec 16 15:20:21 2019 rev:169 rq:757217 version:4.1.0+git.1576228931.ae559358
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2019-12-10
22:42:33.409806142 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.4691/crmsh.changes2019-12-16
15:20:28.531136492 +0100
@@ -1,0 +2,14 @@
+Fri Dec 13 09:33:44 UTC 2019 - xli...@suse.com
+
+- Update to version 4.1.0+git.1576228931.ae559358:
+ * Dev: bootstrap: support multi disk sbd configure
+
+---
+Wed Dec 11 07:05:30 UTC 2019 - xli...@suse.com
+
+- Update to version 4.1.0+git.1576047267.d87652bb:
+ * Dev: behave: functional test for resource failcount set subcommand
+ * Low: unittest: add ut for utils.get_nodeid_from_name
+ * Fix: ui_resource: set resource failcount correctly(bsc#1144241)
+
+---
Old:
crmsh-4.1.0+git.1575875711.41d65be4.tar.bz2
New:
crmsh-4.1.0+git.1576228931.ae559358.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.e2UqJ2/_old 2019-12-16 15:20:29.819135955 +0100
+++ /var/tmp/diff_new_pack.e2UqJ2/_new 2019-12-16 15:20:29.827135952 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.1.0+git.1575875711.41d65be4
+Version:4.1.0+git.1576228931.ae559358
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.e2UqJ2/_old 2019-12-16 15:20:29.887135926 +0100
+++ /var/tmp/diff_new_pack.e2UqJ2/_new 2019-12-16 15:20:29.887135926 +0100
@@ -5,4 +5,4 @@
https://github.com/liangxin1300/crmsh.git
d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
https://github.com/ClusterLabs/crmsh.git
- 000f2a79d35ac8d8642f7c93cf75b6d002f3c6e9
\ No newline at end of file
+ ae559358d1933de123c43a2f86d2d588810d8045
\ No newline at end of file
++ crmsh-4.1.0+git.1575875711.41d65be4.tar.bz2 ->
crmsh-4.1.0+git.1576228931.ae559358.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.1.0+git.1575875711.41d65be4/.travis.yml
new/crmsh-4.1.0+git.1576228931.ae559358/.travis.yml
--- old/crmsh-4.1.0+git.1575875711.41d65be4/.travis.yml 2019-12-09
08:15:11.0 +0100
+++ new/crmsh-4.1.0+git.1576228931.ae559358/.travis.yml 2019-12-13
10:22:11.0 +0100
@@ -65,6 +65,12 @@
script:
- $FUNCTIONAL_TEST qdevice run validate
+- name: "functional test for resource subcommand"
+ before_install:
+- $FUNCTIONAL_TEST resource before_install
+ script:
+- $FUNCTIONAL_TEST resource run
+
- stage: delivery
if: type != pull_request AND branch = master
env:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.1.0+git.1575875711.41d65be4/crmsh/bootstrap.py
new/crmsh-4.1.0+git.1576228931.ae559358/crmsh/bootstrap.py
--- old/crmsh-4.1.0+git.1575875711.41d65be4/crmsh/bootstrap.py 2019-12-09
08:15:11.0 +0100
+++ new/crmsh-4.1.0+git.1576228931.ae559358/crmsh/bootstrap.py 2019-12-13
10:22:11.0 +0100
@@ -1362,38 +1362,44 @@
if not confirm("SBD is already configured to use %s - overwrite?"
% (configured_dev)):
return
-dev = ""
dev_looks_sane = False
while not dev_looks_sane:
-dev = prompt_for_string('Path to storage device (e.g.
/dev/disk/by-id/...), or "none"', r'none|\/.*', dev)
+dev = prompt_for_string('Path to storage device (e.g.
/dev/disk/by-id/...), or "none", use ";" as separator for multi path',
r'none|\/.*')
if dev == "none":
_context.diskless_sbd = True
init_sbd_diskless()
return
-if not is_block_device(dev):
-print("That doesn't look like a block device",
file=sys.stderr)
-dev = ""
-else:
-warn("All data on {} will be destroyed!".format(dev))
-if confirm('Are you sure you wish to use this device?'):
-dev_looks_sane = True
+dev_list = dev.strip(';').split(';')
+for dev_item in dev_list:
+if not
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2019-12-10 22:42:16
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.4691 (New)
Package is "crmsh"
Tue Dec 10 22:42:16 2019 rev:168 rq:755415 version:4.1.0+git.1575875711.41d65be4
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2019-11-19
12:59:50.534114498 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.4691/crmsh.changes2019-12-10
22:42:33.409806142 +0100
@@ -2 +2 @@
-Tue Nov 12 08:36:40 UTC 2019 - xli...@suse.com
+Mon Dec 09 07:55:37 UTC 2019 - xli...@suse.com
@@ -4,2 +4,29 @@
-- Update to version 4.1.0+git.1573547462.281747a7:
- * Dev: unittest: make unittest results more verbose
+- Update to version 4.1.0+git.1575875711.41d65be4:
+ * Dev: ui_cluster: replace --qdevice as --qnetd-hostname
+ * Dev: corosync: add log and debug messages on each certificate steps
+ * Dev: Improvements on naming and class constants
+ * Dev: behave: functional test for qdevice setup and options
+ * Dev: behave: improve functional test for bootstrap process
+ * Dev: ui_cluster: change qdevice related option's help message
+ * Dev: utils: add is_unicast function to check transport type
+ * Dev: corosync: use custom exception IPAlreadyConfiguredError for
add_node_ucast
+ * Dev: unittests: test corosync.Qdevice class
+ * Dev: bootstrap: support qdevice heuristics
+ * Dev: bootstrap: start qdevice/qnetd service when not overwrite
configuration
+ * Dev: ui_corosync: improve corosync status sub-command
+ * Low: utils: refactor parallax_copy, parallax_call and parallax_slurp
+ * Dev: bootstrap: remove qnetd
+ * Dev: bootstrap: when removing qdevice, remove qdevice database
+ * Dev: bootstrap: qdevice certification process when cluster join
+ * Dev: ui_cluster: change option info for qdevice/qnetd
+ * Dev: bootstrap: qdevice certification process when cluster init
+ * Dev: bootstrap: interface for removing qdevice
+ * Dev: corosync: check tie-breaker is a valid nodeid
+ * Dev: bootstrap: combine Qdevice.valid2 into Qdevice.valid_attr
+ * Dev: bootstrap: improve init_qdevice function
+ * Dev: bootstrap: make update_expected_votes as outer function for reuse
+ * Dev: bootstrap: write qdevice config section when configuring qdevice in
stage
+ * Dev: bootstrap: adjust corosync configuration for qdevice
+ * Dev: bootstrap: make qdevice process as a bootstrap stage
+ * Dev: bootstrap: manage qnetd node
+ * Dev: bootstrap: valid qdevice parameters
Old:
crmsh-4.1.0+git.1573547462.281747a7.tar.bz2
New:
crmsh-4.1.0+git.1575875711.41d65be4.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.URMoer/_old 2019-12-10 22:42:34.469805749 +0100
+++ /var/tmp/diff_new_pack.URMoer/_new 2019-12-10 22:42:34.469805749 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.1.0+git.1573547462.281747a7
+Version:4.1.0+git.1575875711.41d65be4
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _service ++
--- /var/tmp/diff_new_pack.URMoer/_old 2019-12-10 22:42:34.505805736 +0100
+++ /var/tmp/diff_new_pack.URMoer/_new 2019-12-10 22:42:34.505805736 +0100
@@ -1,6 +1,6 @@
-git://github.com/ClusterLabs/crmsh.git
+https://github.com/ClusterLabs/crmsh.git
git
crmsh
4.1.0+git.%ct.%h
++ _servicedata ++
--- /var/tmp/diff_new_pack.URMoer/_old 2019-12-10 22:42:34.525805728 +0100
+++ /var/tmp/diff_new_pack.URMoer/_new 2019-12-10 22:42:34.525805728 +0100
@@ -1,4 +1,8 @@
git://github.com/ClusterLabs/crmsh.git
- 4d3730a6afebbb908817c3eab49d8adddaff4857
\ No newline at end of file
+ b8bb14dbbc9d6a0b1e79d696e64246bec0a98357
+https://github.com/liangxin1300/crmsh.git
+ d8dc51b4cb34964aa72e918999ebc7f03b48f3c9
+https://github.com/ClusterLabs/crmsh.git
+ 000f2a79d35ac8d8642f7c93cf75b6d002f3c6e9
\ No newline at end of file
++ crmsh-4.1.0+git.1573547462.281747a7.tar.bz2 ->
crmsh-4.1.0+git.1575875711.41d65be4.tar.bz2 ++
2986 lines of diff (skipped)
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2019-11-19 12:59:44
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.26869 (New)
Package is "crmsh"
Tue Nov 19 12:59:44 2019 rev:167 rq:749464 version:4.1.0+git.1573547462.281747a7
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2019-11-11
13:01:07.965737490 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.26869/crmsh.changes 2019-11-19
12:59:50.534114498 +0100
@@ -1,0 +2,6 @@
+Tue Nov 12 08:36:40 UTC 2019 - xli...@suse.com
+
+- Update to version 4.1.0+git.1573547462.281747a7:
+ * Dev: unittest: make unittest results more verbose
+
+---
Old:
crmsh-4.1.0+git.1573020742.a0b88227.tar.bz2
New:
crmsh-4.1.0+git.1573547462.281747a7.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.G6koq8/_old 2019-11-19 12:59:51.206114074 +0100
+++ /var/tmp/diff_new_pack.G6koq8/_new 2019-11-19 12:59:51.210114072 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.1.0+git.1573020742.a0b88227
+Version:4.1.0+git.1573547462.281747a7
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.G6koq8/_old 2019-11-19 12:59:51.254114044 +0100
+++ /var/tmp/diff_new_pack.G6koq8/_new 2019-11-19 12:59:51.254114044 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- b8bb14dbbc9d6a0b1e79d696e64246bec0a98357
\ No newline at end of file
+ 4d3730a6afebbb908817c3eab49d8adddaff4857
\ No newline at end of file
++ crmsh-4.1.0+git.1573020742.a0b88227.tar.bz2 ->
crmsh-4.1.0+git.1573547462.281747a7.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.1.0+git.1573020742.a0b88227/test/run
new/crmsh-4.1.0+git.1573547462.281747a7/test/run
--- old/crmsh-4.1.0+git.1573020742.a0b88227/test/run2019-11-06
07:12:22.0 +0100
+++ new/crmsh-4.1.0+git.1573547462.281747a7/test/run2019-11-12
09:31:02.0 +0100
@@ -7,13 +7,13 @@
case `pwd` in
*/test/unittests)
- PYTHONPATH=../.. $testexec -w . "$@"
+ PYTHONPATH=../.. $testexec -v -w . "$@"
;;
*/test)
- PYTHONPATH=.. $testexec -w unittests "$@"
+ PYTHONPATH=.. $testexec -v -w unittests "$@"
;;
*)
- PYTHONPATH=. $testexec -w test/unittests "$@"
+ PYTHONPATH=. $testexec -v -w test/unittests "$@"
;;
esac
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2019-11-11 13:01:06
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2990 (New)
Package is "crmsh"
Mon Nov 11 13:01:06 2019 rev:166 rq:747268 version:4.1.0+git.1573020742.a0b88227
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2019-11-06
13:56:49.444203017 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2990/crmsh.changes2019-11-11
13:01:07.965737490 +0100
@@ -1,0 +2,7 @@
+Wed Nov 06 06:17:48 UTC 2019 - xli...@suse.com
+
+- Update to version 4.1.0+git.1573020742.a0b88227:
+ * Test: unittest: test Parallax class
+ * Dev: parallax: create class Parallax to simplify using parallax
+
+---
Old:
crmsh-4.1.0+git.1572504697.472361c5.tar.bz2
New:
crmsh-4.1.0+git.1573020742.a0b88227.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.IAcYTa/_old 2019-11-11 13:01:09.213738812 +0100
+++ /var/tmp/diff_new_pack.IAcYTa/_new 2019-11-11 13:01:09.229738829 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.1.0+git.1572504697.472361c5
+Version:4.1.0+git.1573020742.a0b88227
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.IAcYTa/_old 2019-11-11 13:01:09.309738913 +0100
+++ /var/tmp/diff_new_pack.IAcYTa/_new 2019-11-11 13:01:09.309738913 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- c8d41bd637dd03b4d60a9f35ca099e41ac32eec4
\ No newline at end of file
+ b8bb14dbbc9d6a0b1e79d696e64246bec0a98357
\ No newline at end of file
++ crmsh-4.1.0+git.1572504697.472361c5.tar.bz2 ->
crmsh-4.1.0+git.1573020742.a0b88227.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.1.0+git.1572504697.472361c5/crmsh/parallax.py
new/crmsh-4.1.0+git.1573020742.a0b88227/crmsh/parallax.py
--- old/crmsh-4.1.0+git.1572504697.472361c5/crmsh/parallax.py 1970-01-01
01:00:00.0 +0100
+++ new/crmsh-4.1.0+git.1573020742.a0b88227/crmsh/parallax.py 2019-11-06
07:12:22.0 +0100
@@ -0,0 +1,104 @@
+# Copyright (C) 2019 Xin Liang
+# See COPYING for license information.
+
+
+import os
+import parallax
+
+
+class Parallax(object):
+"""
+# Parallax SSH API
+# call: Executes the given command on a set of hosts, collecting the output
+# copy: Copies files from the local machine to a set of remote hosts
+# slurp: Copies files from a set of remote hosts to local folders
+"""
+def __init__(self, nodes, cmd=None, localdir=None, filename=None,
+ src=None, dst=None, askpass=False, ssh_options=None):
+self.nodes = nodes
+self.askpass = askpass
+self.ssh_options = ssh_options
+
+# used for call
+self.cmd = cmd
+# used for slurp
+self.localdir = localdir
+self.filename = filename
+# used for copy
+self.src = src
+self.dst = dst
+
+self.opts = self.prepare()
+
+def prepare(self):
+opts = parallax.Options()
+if self.ssh_options is None:
+self.ssh_options = ['StrictHostKeyChecking=no',
'ConnectTimeout=10']
+opts.ssh_options = self.ssh_options
+opts.askpass = self.askpass
+# warn_message will available from parallax-1.0.5
+if hasattr(opts, 'warn_message'):
+opts.warn_message = False
+opts.localdir = self.localdir
+return opts
+
+def handle(self, results):
+for host, result in results:
+if isinstance(result, parallax.Error):
+raise ValueError("Failed on {}: {}".format(host, result))
+return results
+
+def call(self):
+results = parallax.call(self.nodes, self.cmd, self.opts)
+return self.handle(list(results.items()))
+
+def slurp(self):
+dst = os.path.basename(self.filename)
+results = parallax.slurp(self.nodes, self.filename, dst, self.opts)
+return self.handle(list(results.items()))
+
+def copy(self):
+results = parallax.copy(self.nodes, self.src, self.dst, self.opts)
+return self.handle(list(results.items()))
+
+
+def parallax_call(nodes, cmd, askpass=False, ssh_options=None):
+"""
+Executes the given command on a set of hosts, collecting the output
+nodes: a set of hosts
+cmd: command
+askpass: Ask
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2019-11-06 13:56:46
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2990 (New)
Package is "crmsh"
Wed Nov 6 13:56:46 2019 rev:165 rq:745170 version:4.1.0+git.1572504697.472361c5
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2019-10-30
14:46:46.358115561 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2990/crmsh.changes2019-11-06
13:56:49.444203017 +0100
@@ -1,0 +2,17 @@
+Thu Oct 31 06:57:08 UTC 2019 - xli...@suse.com
+
+- Update to version 4.1.0+git.1572504697.472361c5:
+ * Doc: ui_configure: do_property: ask to remove maintenance from resources
and nodes
+ * Test: ui_configure: do_property: ask to remove maintenance from resources
and nodes
+ * Dev: ui_configure: do_property: ask to remove maintenance from resources
and nodes
+
+---
+Tue Oct 29 21:57:47 UTC 2019 - xli...@suse.com
+
+- Update to version 4.1.0+git.1572385946.69f4f51b:
+ * Low: unittest: test init_ssh and init_ssh_remote in bootstrap.py
+ * Low: bootstrap: create authorized_keys file if not exists
+ * Low: bootstrap: add "--no-overwrite-sshkey" option to avoid SSH key be
overwritten
+ * Low: bootstrap: don't overwrite ssh key if already exists
+
+---
Old:
crmsh-4.1.0+git.1572337494.6f2c8ea9.tar.bz2
New:
crmsh-4.1.0+git.1572504697.472361c5.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.WURMsp/_old 2019-11-06 13:56:50.712204346 +0100
+++ /var/tmp/diff_new_pack.WURMsp/_new 2019-11-06 13:56:50.720204354 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.1.0+git.1572337494.6f2c8ea9
+Version:4.1.0+git.1572504697.472361c5
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.WURMsp/_old 2019-11-06 13:56:50.824204464 +0100
+++ /var/tmp/diff_new_pack.WURMsp/_new 2019-11-06 13:56:50.824204464 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 6f2c8ea926f61f2ce99fcfbefa401d51feaddbf1
\ No newline at end of file
+ c8d41bd637dd03b4d60a9f35ca099e41ac32eec4
\ No newline at end of file
++ crmsh-4.1.0+git.1572337494.6f2c8ea9.tar.bz2 ->
crmsh-4.1.0+git.1572504697.472361c5.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.1.0+git.1572337494.6f2c8ea9/crmsh/bootstrap.py
new/crmsh-4.1.0+git.1572504697.472361c5/crmsh/bootstrap.py
--- old/crmsh-4.1.0+git.1572337494.6f2c8ea9/crmsh/bootstrap.py 2019-10-29
09:24:54.0 +0100
+++ new/crmsh-4.1.0+git.1572504697.472361c5/crmsh/bootstrap.py 2019-10-31
07:51:37.0 +0100
@@ -670,7 +670,8 @@
start_service("sshd.service")
invoke("mkdir -m 700 -p /root/.ssh")
if os.path.exists("/root/.ssh/id_rsa"):
-if not confirm("/root/.ssh/id_rsa already exists - overwrite?"):
+if _context.yes_to_all and _context.no_overwrite_sshkey or \
+not confirm("/root/.ssh/id_rsa already exists - overwrite?"):
return
rmfile("/root/.ssh/id_rsa")
status("Generating SSH key")
@@ -682,7 +683,10 @@
"""
Called by ha-cluster-join
"""
-authkeys = open("/root/.ssh/authorized_keys", "r+")
+authorized_keys_file = "/root/.ssh/authorized_keys"
+if not os.path.exists(authorized_keys_file):
+open(authorized_keys_file, 'w').close()
+authkeys = open(authorized_keys_file, "r+")
authkeys_data = authkeys.read()
for key in ("id_rsa", "id_dsa", "id_ecdsa", "id_ed25519"):
fn = os.path.join("/root/.ssh", key)
@@ -690,7 +694,7 @@
continue
keydata = open(fn + ".pub").read()
if keydata not in authkeys_data:
-append(fn + ".pub", "/root/.ssh/authorized_keys")
+append(fn + ".pub", authorized_keys_file)
def init_csync2():
@@ -2056,7 +2060,7 @@
def bootstrap_init(cluster_name="hacluster", ui_context=None, nic=None,
ocfs2_device=None,
shared_device=None, sbd_device=None, diskless_sbd=False,
quiet=False,
- template=None, admin_ip=None, yes_to_all=False,
+ template=None, admin_ip=None, yes_to_all=False,
no_overwrite_sshkey=False,
unicast=False, second_hb=False, ipv6=False, watchdog=None,
qdevice=None, stage=None, args=None):
"""
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2019-10-30 14:46:29
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2990 (New)
Package is "crmsh"
Wed Oct 30 14:46:29 2019 rev:164 rq:743824 version:4.1.0+git.1572337494.6f2c8ea9
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2019-09-30
16:03:03.100633369 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2990/crmsh.changes2019-10-30
14:46:46.358115561 +0100
@@ -1,0 +2,22 @@
+Tue Oct 29 08:30:11 UTC 2019 - xli...@suse.com
+
+- Update to version 4.1.0+git.1572337494.6f2c8ea9:
+ * Doc: ui_node: do_maintenance: ask to remove maintenance attr from
primitives
+ * Test: ui_node: do_maintenance: ask to remove maintenance attr from
primitives
+ * Dev: ui_node: do_maintenance: ask to remove maintenance attr from
primitives
+
+---
+Mon Oct 28 08:44:50 UTC 2019 - xli...@suse.com
+
+- Update to version 4.1.0+git.1572251962.bc706121:
+ * unittest: add unittest for corosync.add_node_ucast
+ * Fix: corosync: reject append ipaddress to config file if already
have(bsc#1127095, 1127096)
+
+---
+Mon Oct 21 08:09:02 UTC 2019 - dake...@suse.com
+
+- Update to version 4.1.0+git.1571645029.57177c5d:
+ * Test: ui_resource: ask about ALL primitives when overriding attributes
+ * Dev: ui_resource: ask about ALL primitives when overriding attributes
+
+---
Old:
crmsh-4.1.0+git.1569593219.e357a9b9.tar.bz2
New:
crmsh-4.1.0+git.1572337494.6f2c8ea9.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.yL9dx8/_old 2019-10-30 14:46:47.122116373 +0100
+++ /var/tmp/diff_new_pack.yL9dx8/_new 2019-10-30 14:46:47.130116382 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.1.0+git.1569593219.e357a9b9
+Version:4.1.0+git.1572337494.6f2c8ea9
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.yL9dx8/_old 2019-10-30 14:46:47.182116437 +0100
+++ /var/tmp/diff_new_pack.yL9dx8/_new 2019-10-30 14:46:47.182116437 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- e357a9b98c697d57d5ef33b489a1b59d02dea77a
\ No newline at end of file
+ 6f2c8ea926f61f2ce99fcfbefa401d51feaddbf1
\ No newline at end of file
++ crmsh-4.1.0+git.1569593219.e357a9b9.tar.bz2 ->
crmsh-4.1.0+git.1572337494.6f2c8ea9.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.1.0+git.1569593219.e357a9b9/crmsh/bootstrap.py
new/crmsh-4.1.0+git.1572337494.6f2c8ea9/crmsh/bootstrap.py
--- old/crmsh-4.1.0+git.1569593219.e357a9b9/crmsh/bootstrap.py 2019-09-27
16:06:59.0 +0200
+++ new/crmsh-4.1.0+git.1572337494.6f2c8ea9/crmsh/bootstrap.py 2019-10-29
09:24:54.0 +0100
@@ -1748,7 +1748,10 @@
break
print("")
invoke("rm -f /var/lib/heartbeat/crm/* /var/lib/pacemaker/cib/*")
-corosync.add_node_ucast(ringXaddr_res)
+try:
+corosync.add_node_ucast(ringXaddr_res)
+except ValueError as e:
+warn(e)
csync2_update(corosync.conf())
invoke("ssh -o StrictHostKeyChecking=no root@{} corosync-cfgtool
-R".format(seed_host))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.1.0+git.1569593219.e357a9b9/crmsh/corosync.py
new/crmsh-4.1.0+git.1572337494.6f2c8ea9/crmsh/corosync.py
--- old/crmsh-4.1.0+git.1569593219.e357a9b9/crmsh/corosync.py 2019-09-27
16:06:59.0 +0200
+++ new/crmsh-4.1.0+git.1572337494.6f2c8ea9/crmsh/corosync.py 2019-10-29
09:24:54.0 +0100
@@ -386,6 +386,15 @@
f = open(conf()).read()
p = Parser(f)
+# to check if the same IP already configured
+exist_iplist = []
+for path in p.all_paths():
+if re.search('nodelist.node.ring[0-9]*_addr', path):
+exist_iplist.extend(p.get_all(path))
+for ip in IParray:
+if ip in exist_iplist:
+raise ValueError("IP {} was already configured".format(ip))
+
node_id = get_free_nodeid(p)
node_value = []
for i, addr in enumerate(IParray):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.1.0+git.1569593219.e357a9b9/crmsh/ui_node.py
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2019-09-30 16:02:57
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2352 (New)
Package is "crmsh"
Mon Sep 30 16:02:57 2019 rev:163 rq:734026 version:4.1.0+git.1569593219.e357a9b9
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2019-09-23
12:37:54.665605088 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2352/crmsh.changes2019-09-30
16:03:03.100633369 +0200
@@ -1,0 +2,14 @@
+Fri Sep 27 14:09:17 UTC 2019 - dake...@suse.com
+
+- Update to version 4.1.0+git.1569593219.e357a9b9:
+ * Fix: ui_cluster: refactor function list_cluster_nodes and handle the None
situation(bsc#1145520)
+
+---
+Fri Sep 27 14:04:51 UTC 2019 - dake...@suse.com
+
+- Update to version 4.1.0+git.1569593061.35f57072:
+ * High: cibconfig: Correctly sanitize the original CIB as patch base
(bsc#1127716, bsc#1138405)
+ * Revert "high: cibconfig: Use correct CIB as patch base (bsc#1127716)"
+ * Partially revert "medium: cibconfig: Sanitize CIB for patching
(bsc#1127716)"
+
+---
Old:
crmsh-4.1.0+git.1567524903.fff07b88.tar.bz2
New:
crmsh-4.1.0+git.1569593219.e357a9b9.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.PBahQc/_old 2019-09-30 16:03:04.628629303 +0200
+++ /var/tmp/diff_new_pack.PBahQc/_new 2019-09-30 16:03:04.628629303 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.1.0+git.1567524903.fff07b88
+Version:4.1.0+git.1569593219.e357a9b9
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.PBahQc/_old 2019-09-30 16:03:04.660629218 +0200
+++ /var/tmp/diff_new_pack.PBahQc/_new 2019-09-30 16:03:04.664629207 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- f01ad01a93385b981987dad29a4c7ae019bfdd6b
\ No newline at end of file
+ e357a9b98c697d57d5ef33b489a1b59d02dea77a
\ No newline at end of file
++ crmsh-4.1.0+git.1567524903.fff07b88.tar.bz2 ->
crmsh-4.1.0+git.1569593219.e357a9b9.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.1.0+git.1567524903.fff07b88/crmsh/cibconfig.py
new/crmsh-4.1.0+git.1569593219.e357a9b9/crmsh/cibconfig.py
--- old/crmsh-4.1.0+git.1567524903.fff07b88/crmsh/cibconfig.py 2019-09-03
17:35:03.0 +0200
+++ new/crmsh-4.1.0+git.1569593219.e357a9b9/crmsh/cibconfig.py 2019-09-27
16:06:59.0 +0200
@@ -40,7 +40,7 @@
from .xmlutil import sanity_check_nvpairs, merge_nodes, op2list, mk_rsc_type,
is_resource
from .xmlutil import stuff_comments, is_comment, is_constraint, read_cib,
processing_sort_cli
from .xmlutil import find_operation, get_rsc_children_ids, is_primitive,
referenced_resources
-from .xmlutil import cibdump2tmp, cibdump2elem, processing_sort,
get_rsc_ref_ids, merge_tmpl_into_prim
+from .xmlutil import cibdump2elem, processing_sort, get_rsc_ref_ids,
merge_tmpl_into_prim
from .xmlutil import remove_id_used_attributes, get_top_cib_nodes
from .xmlutil import merge_attributes, is_cib_element, sanity_check_meta
from .xmlutil import is_simpleconstraint, is_template, rmnode, is_defaults,
is_live_cib
@@ -2680,7 +2680,8 @@
# now increase the epoch by 1
self.bump_epoch()
self._set_cib_attributes(self.cib_elem)
-tmpf = cibdump2tmp(filterfn=sanitize_cib_for_patching)
+cib_s = xml_tostring(self.cib_orig, pretty_print=True)
+tmpf = str2tmp(cib_s, suffix=".xml")
if not tmpf or not ensure_sudo_readable(tmpf):
return False
tmpfiles.add(tmpf)
@@ -2689,6 +2690,7 @@
# produce a diff:
# dump_new_conf | crm_diff -o self.cib_orig -n -
+common_debug("Basis: %s" % (open(tmpf).read()))
common_debug("Input: %s" % (xml_tostring(self.cib_elem)))
rc, cib_diff = filter_string("%s -o %s -n -" %
(self._crm_diff_cmd, tmpf),
@@ -2795,9 +2797,10 @@
cib = cibtext2elem(cib)
if not self._import_cib(cib):
return False
-sanitize_cib(self.cib_elem)
if cibadmin_can_patch():
self.cib_orig = copy.deepcopy(self.cib_elem)
+sanitize_cib_for_patching(self.cib_orig)
+sanitize_cib(self.cib_elem)
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2019-09-23 12:34:10
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.7948 (New)
Package is "crmsh"
Mon Sep 23 12:34:10 2019 rev:162 rq:731950 version:4.1.0+git.1567524903.fff07b88
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2019-08-22
10:52:54.365695588 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.7948/crmsh.changes2019-09-23
12:37:54.665605088 +0200
@@ -1,0 +2,21 @@
+Tue Sep 03 15:39:31 UTC 2019 - kgronl...@suse.com
+
+- Update to version 4.1.0+git.1567524903.fff07b88:
+ * Doc: ui_resource: resolve maintenance vs is-managed conflict
+ * Test: ui_resource: resolve maintenance vs is-managed conflict
+ * Dev: ui_resource: resolve maintenance vs is-managed conflict
+
+---
+Tue Aug 27 13:41:08 UTC 2019 - kgronl...@suse.com
+
+- Update to version 4.1.0+git.1566912937.ad2608af:
+ * Test: ui_resource: maintenance: stop using crm_resource
+ * Dev: ui_resource: maintenance: stop using crm_resource
+
+---
+Thu Aug 22 08:36:44 UTC 2019 - dake...@suse.com
+
+- Update to version 4.1.0+git.1566462738.45748f84:
+ * Revert "dev: Suggestion: Try to centralized command options in one file"
+
+---
Old:
crmsh-4.1.0+git.1566218232.dbdf060c.tar.bz2
New:
crmsh-4.1.0+git.1567524903.fff07b88.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.HfJ2EY/_old 2019-09-23 12:37:55.181605003 +0200
+++ /var/tmp/diff_new_pack.HfJ2EY/_new 2019-09-23 12:37:55.181605003 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.1.0+git.1566218232.dbdf060c
+Version:4.1.0+git.1567524903.fff07b88
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.HfJ2EY/_old 2019-09-23 12:37:55.213604998 +0200
+++ /var/tmp/diff_new_pack.HfJ2EY/_new 2019-09-23 12:37:55.213604998 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- dbdf060c6e4809cf562ff7beafbd5afff8de6ebf
\ No newline at end of file
+ f01ad01a93385b981987dad29a4c7ae019bfdd6b
\ No newline at end of file
++ crmsh-4.1.0+git.1566218232.dbdf060c.tar.bz2 ->
crmsh-4.1.0+git.1567524903.fff07b88.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.1.0+git.1566218232.dbdf060c/crmsh/options.py
new/crmsh-4.1.0+git.1567524903.fff07b88/crmsh/options.py
--- old/crmsh-4.1.0+git.1566218232.dbdf060c/crmsh/options.py2019-08-19
14:37:12.0 +0200
+++ new/crmsh-4.1.0+git.1567524903.fff07b88/crmsh/options.py2019-09-03
17:35:03.0 +0200
@@ -16,77 +16,3 @@
scriptdir = ""
# set to true when completing non-interactively
shell_completion = False
-
-
-arg_parameter_key = ["action", "dest", "metavar", "default", "type", "help"]
-
-cluster_init_base_options_value = [
-("-h", "--help", "store_true", "help", "", None, None, "Show this help
message"),
-
-("-q", "--quiet", "store_true", "quiet", "", None, None,
- "Be quiet (don't describe what's happening, just do it)"),
-
-("-y", "--yes", "store_true", "yes_to_all", "", None, None,
- 'Answer "yes" to all prompts (use with caution, this is destructive,
especially during the "storage" stage)'),
-
-("-t", "--template", "store", "template", "", None, None,
- 'Optionally configure cluster with template "name" (currently only
"ocfs2" is valid here)'),
-
-("-n", "--name", "store", "name", "NAME", "hacluster", None,
- 'Set the name of the configured cluster.'),
-
-("-N", "--nodes", "store", "nodes", "NODES", None, None,
- 'Additional nodes to add to the created cluster. ' +
- 'May include the current node, which will always be the initial cluster
node.'),
-
-("-S", "--enable-sbd", "store_true", "diskless_sbd", "", None, None,
- "Enable SBD even if no SBD device is configured (diskless mode)"),
-
-("-w", "--watchdog", "store", "watchdog", "WATCHDOG", None, None, "Use the
given watchdog device")
-]
-
-cluster_init_net_options_value = [
-("-i", "--interface", "store", "nic", "IF", None, str, "Bind to IP address
on interface IF"),
-
-("-u", "--unicast", "store_true", "unicast", "", None, None,
- "Configure corosync to communicate over unicast (UDP), and not multicast.
" +
-
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2019-08-22 10:52:51
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.22127 (New)
Package is "crmsh"
Thu Aug 22 10:52:51 2019 rev:161 rq:724856 version:4.1.0+git.1566218232.dbdf060c
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2019-07-29
17:27:29.426277800 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.22127/crmsh.changes 2019-08-22
10:52:54.365695588 +0200
@@ -1,0 +2,7 @@
+Mon Aug 19 12:43:55 UTC 2019 - dake...@suse.com
+
+- Update to version 4.1.0+git.1566218232.dbdf060c:
+ * Fix: utils: fix logic for process non comments line(bsc#1145823)
+ * Low: unittest: add unittest for bsc#1145823
+
+---
Old:
crmsh-4.1.0+git.1563261260.3b251242.tar.bz2
New:
crmsh-4.1.0+git.1566218232.dbdf060c.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.riF02a/_old 2019-08-22 10:52:54.937695511 +0200
+++ /var/tmp/diff_new_pack.riF02a/_new 2019-08-22 10:52:54.937695511 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.1.0+git.1563261260.3b251242
+Version:4.1.0+git.1566218232.dbdf060c
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.riF02a/_old 2019-08-22 10:52:54.985695505 +0200
+++ /var/tmp/diff_new_pack.riF02a/_new 2019-08-22 10:52:54.985695505 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- d6fd16b91113c57af0e96b1d6aca0630ffdccaa1
\ No newline at end of file
+ dbdf060c6e4809cf562ff7beafbd5afff8de6ebf
\ No newline at end of file
++ crmsh-4.1.0+git.1563261260.3b251242.tar.bz2 ->
crmsh-4.1.0+git.1566218232.dbdf060c.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.1.0+git.1563261260.3b251242/crmsh/utils.py
new/crmsh-4.1.0+git.1566218232.dbdf060c/crmsh/utils.py
--- old/crmsh-4.1.0+git.1563261260.3b251242/crmsh/utils.py 2019-07-16
09:14:20.0 +0200
+++ new/crmsh-4.1.0+git.1566218232.dbdf060c/crmsh/utils.py 2019-08-19
14:37:12.0 +0200
@@ -1904,18 +1904,18 @@
outp += line
else:
matched = False
-try:
-key, _ = line.split("=", 1)
-for k, v in values.items():
-if k == key:
-matched = True
-outp += '%s=%s\n' % (k, doublequote(v))
-del values[k]
-break
-if not matched:
+try:
+key, _ = line.split("=", 1)
+for k, v in values.items():
+if k == key:
+matched = True
+outp += '%s=%s\n' % (k, doublequote(v))
+del values[k]
+break
+if not matched:
+outp += line
+except ValueError:
outp += line
-except ValueError:
-outp += line
for k, v in values.items():
outp += '%s=%s\n' % (k, doublequote(v))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.1.0+git.1563261260.3b251242/test/unittests/test_utils.py
new/crmsh-4.1.0+git.1566218232.dbdf060c/test/unittests/test_utils.py
--- old/crmsh-4.1.0+git.1563261260.3b251242/test/unittests/test_utils.py
2019-07-16 09:14:20.0 +0200
+++ new/crmsh-4.1.0+git.1566218232.dbdf060c/test/unittests/test_utils.py
2019-08-19 14:37:12.0 +0200
@@ -177,3 +177,14 @@
sc = utils.parse_sysconfig(fname)
assert (sc.get("FW_SERVICES_ACCEPT_EXT") == "foo=bar")
assert (sc.get("FOO") == "bar")
+
+def test_sysconfig_set_bsc1145823():
+s = '''# this is test
+#age=1000
+'''
+fd, fname = tmpfiles.create()
+with open(fname, 'w') as f:
+f.write(s)
+utils.sysconfig_set(fname, age="100")
+sc = utils.parse_sysconfig(fname)
+assert (sc.get("age") == "100")
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2019-07-29 17:27:27
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.4126 (New)
Package is "crmsh"
Mon Jul 29 17:27:27 2019 rev:160 rq:717840 version:4.1.0+git.1563261260.3b251242
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2019-06-22
11:24:39.317415833 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.4126/crmsh.changes2019-07-29
17:27:29.426277800 +0200
@@ -1,0 +2,6 @@
+Tue Jul 16 07:19:00 UTC 2019 - kgronl...@suse.com
+
+- Update to version 4.1.0+git.1563261260.3b251242:
+ * doc: manpages: Fix spelling
+
+---
Old:
crmsh-4.1.0+git.1561107542.79593cb0.tar.bz2
New:
crmsh-4.1.0+git.1563261260.3b251242.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.ft5bPn/_old 2019-07-29 17:27:30.046277570 +0200
+++ /var/tmp/diff_new_pack.ft5bPn/_new 2019-07-29 17:27:30.050277569 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.1.0+git.1561107542.79593cb0
+Version:4.1.0+git.1563261260.3b251242
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.ft5bPn/_old 2019-07-29 17:27:30.086277555 +0200
+++ /var/tmp/diff_new_pack.ft5bPn/_new 2019-07-29 17:27:30.086277555 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 79593cb00d0e7ead6dc36bf1691deb5a47e354d3
\ No newline at end of file
+ d6fd16b91113c57af0e96b1d6aca0630ffdccaa1
\ No newline at end of file
++ crmsh-4.1.0+git.1561107542.79593cb0.tar.bz2 ->
crmsh-4.1.0+git.1563261260.3b251242.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.1.0+git.1561107542.79593cb0/doc/crm.8.adoc
new/crmsh-4.1.0+git.1563261260.3b251242/doc/crm.8.adoc
--- old/crmsh-4.1.0+git.1561107542.79593cb0/doc/crm.8.adoc 2019-06-21
10:59:02.0 +0200
+++ new/crmsh-4.1.0+git.1563261260.3b251242/doc/crm.8.adoc 2019-07-16
09:14:20.0 +0200
@@ -3405,7 +3405,7 @@
The `group` command creates a group of resources. This can be useful
when resources depend on other resources and require that those
-resources start in order on the same node. A commmon use of resource
+resources start in order on the same node. A common use of resource
groups is to ensure that a server and a virtual IP are located
together, and that the virtual IP is started before the server.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.1.0+git.1561107542.79593cb0/doc/website-v1/man-1.2.adoc
new/crmsh-4.1.0+git.1563261260.3b251242/doc/website-v1/man-1.2.adoc
--- old/crmsh-4.1.0+git.1561107542.79593cb0/doc/website-v1/man-1.2.adoc
2019-06-21 10:59:02.0 +0200
+++ new/crmsh-4.1.0+git.1563261260.3b251242/doc/website-v1/man-1.2.adoc
2019-07-16 09:14:20.0 +0200
@@ -1747,7 +1747,7 @@
The `group` command creates a group of resources. This can be useful
when resources depend on other resources and require that those
-resources start in order on the same node. A commmon use of resource
+resources start in order on the same node. A common use of resource
groups is to ensure that a server and a virtual IP are located
together, and that the virtual IP is started before the server.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.1.0+git.1561107542.79593cb0/doc/website-v1/man-2.0.adoc
new/crmsh-4.1.0+git.1563261260.3b251242/doc/website-v1/man-2.0.adoc
--- old/crmsh-4.1.0+git.1561107542.79593cb0/doc/website-v1/man-2.0.adoc
2019-06-21 10:59:02.0 +0200
+++ new/crmsh-4.1.0+git.1563261260.3b251242/doc/website-v1/man-2.0.adoc
2019-07-16 09:14:20.0 +0200
@@ -3053,7 +3053,7 @@
The `group` command creates a group of resources. This can be useful
when resources depend on other resources and require that those
-resources start in order on the same node. A commmon use of resource
+resources start in order on the same node. A common use of resource
groups is to ensure that a server and a virtual IP are located
together, and that the virtual IP is started before the server.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.1.0+git.1561107542.79593cb0/doc/website-v1/man-3.adoc
new/crmsh-4.1.0+git.1563261260.3b251242/doc/website-v1/man-3.adoc
---
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2019-06-22 11:24:36
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.4615 (New)
Package is "crmsh"
Sat Jun 22 11:24:36 2019 rev:159 rq:711294 version:4.1.0+git.1561107542.79593cb0
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2019-06-12
13:15:38.616732092 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.4615/crmsh.changes2019-06-22
11:24:39.317415833 +0200
@@ -1,0 +2,6 @@
+Fri Jun 21 09:47:07 UTC 2019 - dake...@suse.com
+
+- Update to version 4.1.0+git.1561107542.79593cb0:
+ * Fix: utils: issue in to_ascii (bsc#1138115)
+
+---
Old:
crmsh-4.0.0+git.1558430233.89bb6eec.tar.bz2
New:
crmsh-4.1.0+git.1561107542.79593cb0.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.j4xmQJ/_old 2019-06-22 11:24:41.421418034 +0200
+++ /var/tmp/diff_new_pack.j4xmQJ/_new 2019-06-22 11:24:41.457418071 +0200
@@ -12,7 +12,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/
#
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.0.0+git.1558430233.89bb6eec
+Version:4.1.0+git.1561107542.79593cb0
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _service ++
--- /var/tmp/diff_new_pack.j4xmQJ/_old 2019-06-22 11:24:41.869418502 +0200
+++ /var/tmp/diff_new_pack.j4xmQJ/_new 2019-06-22 11:24:41.893418528 +0200
@@ -3,7 +3,7 @@
git://github.com/ClusterLabs/crmsh.git
git
crmsh
-4.0.0+git.%ct.%h
+4.1.0+git.%ct.%h
master
enable
++ _servicedata ++
--- /var/tmp/diff_new_pack.j4xmQJ/_old 2019-06-22 11:24:42.097418741 +0200
+++ /var/tmp/diff_new_pack.j4xmQJ/_new 2019-06-22 11:24:42.117418762 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 89bb6eec61701c1e6675dda65b48be19e18754f3
\ No newline at end of file
+ 79593cb00d0e7ead6dc36bf1691deb5a47e354d3
\ No newline at end of file
++ crmsh-4.0.0+git.1558430233.89bb6eec.tar.bz2 ->
crmsh-4.1.0+git.1561107542.79593cb0.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.0.0+git.1558430233.89bb6eec/ChangeLog
new/crmsh-4.1.0+git.1561107542.79593cb0/ChangeLog
--- old/crmsh-4.0.0+git.1558430233.89bb6eec/ChangeLog 2019-05-21
11:17:13.0 +0200
+++ new/crmsh-4.1.0+git.1561107542.79593cb0/ChangeLog 2019-06-21
10:59:02.0 +0200
@@ -1,3 +1,356 @@
+* Fri Jun 21 2019 Diego Akechi and many others
+- Release 4.1.0
+- Fix: utils: issue in to_ascii (bsc#1138115)
+- Fix: bootstrap: bindnetaddr should accept both network and specific
IP(bsc#1135585, bsc#1135586)
+- Fix: hb_report: analysis.txt should includes warning, error, critical
messages(bsc#1135696)
+- Included Contributing Section on README.
+- medium: ui_node: Check corosync state before clearstate (bsc#1129702)
+- fix: hb_report: handle UnicodeDecodeError(bsc#1130715) * setting
error='replace' to replace invalid utf-8 characters * try to catch
UnicodeDecodeError and print traceback
+- medium: cibconfig: Sanitize CIB for patching (bsc#1127716)
+- high: cibconfig: Use correct CIB as patch base (bsc#1127716)
+- medium: parse: Detect and error on illegal ordering of op attributes
(bsc#1129210)
+- medium: utils: Handle sysconfig values containing = (bsc#1129317)
+- low: hb_report: collect output of "sbd dump" and "sbd list"(bsc#1129383)
+- low: msg: add timestamp for DEBUG messages(bsc#1129380)
+- Fix: bsc#1129719: check command and related files exist
+- Low: doc: add related notice for new "promot*" tags
+- High: testcase: add testcases from new added "promot*"tags
+- High: constants: add "promotable", "promoted-max" and "promoted-node-max" in
clone meta attributes
+- Low: testcase: add testcase for #425
+- Fix: cibconfig: #425 The ID attribute is not required for select and
select_attributes
+- doc: Add guide to releasing new versions
+- medium: scripts: Set kind for order constraints, not score (bsc#1123187)
+- low: utils: add support for dpkg
+- low: utils: add support for apt-get
+- low: utils: convert string contstants to bytes
+- High: Testcases: update the testcases/bugs for bsc#1120554
+- Fix: bsc#1120857,1120856 bootstrap warning messages
commit crmsh for openSUSE:Factory
Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2019-06-12 13:15:37 Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new.4811 (New) Package is "crmsh" Wed Jun 12 13:15:37 2019 rev:158 rq:708962 version:4.0.0+git.1558430233.89bb6eec Changes: --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2019-05-28 09:42:45.541854796 +0200 +++ /work/SRC/openSUSE:Factory/.crmsh.new.4811/crmsh.changes2019-06-12 13:15:38.616732092 +0200 @@ -2 +2 @@ -Tue May 21 09:17:59 UTC 2019 - k...@koru.se +Tue May 21 09:17:59 UTC 2019 - kgronl...@suse.com @@ -7 +6,0 @@ - * Remove landscape.io @@ -11 +10 @@ -Mon May 20 09:31:06 UTC 2019 - k...@koru.se +Mon May 20 09:31:06 UTC 2019 - kgronl...@suse.com @@ -14,3 +13,3 @@ - * fix: hb_report: handle UnicodeDecodeError(bsc#1130715) * setting error='replace' to replace invalid utf-8 characters * try to catch UnicodeDecodeError and print traceback - * dev: hb_report: Using Tempfile class to manage tempfiles - * dev: unittest: add test_report.py to test hb_report module + * fix: hb_report: handle UnicodeDecodeError(bsc#1130715) + * setting error='replace' to replace invalid utf-8 characters + * try to catch UnicodeDecodeError and print traceback Other differences: --
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2019-05-28 09:42:42
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.5148 (New)
Package is "crmsh"
Tue May 28 09:42:42 2019 rev:157 rq:705613 version:4.0.0+git.1558430233.89bb6eec
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2019-05-10
09:19:15.732415788 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.5148/crmsh.changes2019-05-28
09:42:45.541854796 +0200
@@ -1,0 +2,17 @@
+Tue May 21 09:17:59 UTC 2019 - k...@koru.se
+
+- Update to version 4.0.0+git.1558430233.89bb6eec:
+ * Fix: bootstrap: bindnetaddr should accept both network and specific
IP(bsc#1135585, bsc#1135586)
+ * Fix: hb_report: analysis.txt should includes warning, error, critical
messages(bsc#1135696)
+ * Remove landscape.io
+ * medium: ui_node: Check corosync state before clearstate (bsc#1129702)
+
+---
+Mon May 20 09:31:06 UTC 2019 - k...@koru.se
+
+- Update to version 4.0.0+git.1558344349.9cd3669a:
+ * fix: hb_report: handle UnicodeDecodeError(bsc#1130715) * setting
error='replace' to replace invalid utf-8 characters * try to catch
UnicodeDecodeError and print traceback
+ * dev: hb_report: Using Tempfile class to manage tempfiles
+ * dev: unittest: add test_report.py to test hb_report module
+
+---
Old:
crmsh-4.0.0+git.1557307618.dc73b57b.tar.bz2
New:
crmsh-4.0.0+git.1558430233.89bb6eec.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.8JMCpd/_old 2019-05-28 09:42:46.393854501 +0200
+++ /var/tmp/diff_new_pack.8JMCpd/_new 2019-05-28 09:42:46.417854492 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.0.0+git.1557307618.dc73b57b
+Version:4.0.0+git.1558430233.89bb6eec
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.8JMCpd/_old 2019-05-28 09:42:46.881854332 +0200
+++ /var/tmp/diff_new_pack.8JMCpd/_new 2019-05-28 09:42:46.905854324 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- dc73b57b255d9b2a2fbf6cca0c459a63c2c76624
\ No newline at end of file
+ 89bb6eec61701c1e6675dda65b48be19e18754f3
\ No newline at end of file
++ crmsh-4.0.0+git.1557307618.dc73b57b.tar.bz2 ->
crmsh-4.0.0+git.1558430233.89bb6eec.tar.bz2 ++
1696 lines of diff (skipped)
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2019-05-10 09:19:11
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.5148 (New)
Package is "crmsh"
Fri May 10 09:19:11 2019 rev:156 rq:701570 version:4.0.0+git.1557307618.dc73b57b
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2019-03-26
15:45:25.168082051 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.5148/crmsh.changes2019-05-10
09:19:15.732415788 +0200
@@ -1,0 +2,11 @@
+Wed May 08 09:47:11 UTC 2019 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1557307618.dc73b57b:
+ * medium: cibconfig: Sanitize CIB for patching (bsc#1127716)
+ * high: cibconfig: Use correct CIB as patch base (bsc#1127716)
+ * medium: parse: Detect and error on illegal ordering of op attributes
(bsc#1129210)
+ * medium: utils: Handle sysconfig values containing = (bsc#1129317)
+ * low: hb_report: collect output of "sbd dump" and "sbd list"(bsc#1129383)
+ * low: msg: add timestamp for DEBUG messages(bsc#1129380)
+
+---
Old:
crmsh-4.0.0+git.1552985860.56f2db3a.tar.bz2
New:
crmsh-4.0.0+git.1557307618.dc73b57b.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.IWVPDR/_old 2019-05-10 09:19:17.220418089 +0200
+++ /var/tmp/diff_new_pack.IWVPDR/_new 2019-05-10 09:19:17.244418126 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.0.0+git.1552985860.56f2db3a
+Version:4.0.0+git.1557307618.dc73b57b
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.IWVPDR/_old 2019-05-10 09:19:17.700418831 +0200
+++ /var/tmp/diff_new_pack.IWVPDR/_new 2019-05-10 09:19:17.720418862 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 56f2db3ab753c7df0554158b718faa33ecefb081
\ No newline at end of file
+ dc73b57b255d9b2a2fbf6cca0c459a63c2c76624
\ No newline at end of file
++ crmsh-4.0.0+git.1552985860.56f2db3a.tar.bz2 ->
crmsh-4.0.0+git.1557307618.dc73b57b.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.0.0+git.1552985860.56f2db3a/.travis.yml
new/crmsh-4.0.0+git.1557307618.dc73b57b/.travis.yml
--- old/crmsh-4.0.0+git.1552985860.56f2db3a/.travis.yml 2019-03-19
09:57:40.0 +0100
+++ new/crmsh-4.0.0+git.1557307618.dc73b57b/.travis.yml 2019-05-08
11:26:58.0 +0200
@@ -4,23 +4,70 @@
services:
- docker
+stages:
+ - test
+ - delivery
+ - submit
+
env:
global:
-
CC_TEST_REPORTER_ID=a2579335b631ec35473874d7bb4fe983025c0287cea89c9dc34c35f98ee3963d
-before_script:
- - curl -L
https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64
> ./cc-test-reporter
- - chmod +x ./cc-test-reporter
- - ./cc-test-reporter before-build
-
-before_install:
- - docker pull krig/crmsh:latest
-
-script:
- - docker run -t -v "$(pwd):/app" krig/crmsh /bin/sh -c "systemctl start
dbus; cd /app; ./test/run-in-travis.sh"
-
-after_failure:
- - sudo cat $TRAVIS_BUILD_DIR/crmtestout/regression.out
$TRAVIS_BUILD_DIR/crmtestout/crm.*
-
-after_script:
- - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
+jobs:
+ include:
+- stage: test
+ before_script:
+- curl -L
https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64
> ./cc-test-reporter
+- chmod +x ./cc-test-reporter
+- ./cc-test-reporter before-build
+
+ before_install:
+- docker pull krig/crmsh:latest
+
+ script:
+- docker run -t -v "$(pwd):/app" krig/crmsh /bin/sh -c "systemctl
start dbus; cd /app; ./test/run-in-travis.sh"
+
+ after_failure:
+- sudo cat $TRAVIS_BUILD_DIR/crmtestout/regression.out
$TRAVIS_BUILD_DIR/crmtestout/crm.*
+
+ after_script:
+- ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
+
+- stage: delivery
+ if: type != pull_request AND branch = master
+ env:
+- FOLDER=/package
+- PACKAGE_NAME=crmsh
+
+ before_install:
+- docker pull shap/continuous_deliver:latest
+
+ script:
+- |
+ docker run -t -v "$(pwd):/package" \
+ -e OBS_USER=$OBS_USER \
+ -e OBS_PASS=$OBS_PASS \
+ -e FOLDER=$FOLDER \
+ -e OBS_PROJECT=$OBS_PROJECT \
+ -e PACKAGE_NAME=$PACKAGE_NAME \
+ shap/continuous_deliver \
+ /bin/bash -c
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2019-03-26 15:45:19
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.25356 (New)
Package is "crmsh"
Tue Mar 26 15:45:19 2019 rev:155 rq:688380 version:4.0.0+git.1552985860.56f2db3a
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2019-02-08
12:11:15.585517474 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.25356/crmsh.changes 2019-03-26
15:45:25.168082051 +0100
@@ -1,0 +2,15 @@
+Thu Mar 21 08:17:24 UTC 2019 - xli...@suse.com
+
+- Update to version 4.0.0+git.1552985860.56f2db3a:
+ * Fix: bsc#1129719: check command and related files exist
+ * High: constants: add "promotable", "promoted-max" and "promoted-node-max"
in clone meta attributes
+ * Fix: cibconfig: #425 The ID attribute is not required for select and
select_attributes
+ * medium: scripts: Set kind for order constraints, not score (bsc#1123187)
+ * low: utils: add support for dpkg
+ * low: utils: add support for apt-get
+ * low: utils: convert string contstants to bytes
+ * Fix: bsc#1120857,1120856 bootstrap warning messages should better start
with like "WARNING:" instead of "!"
+ * Fix: bsc#1120554, bsc#1120555 crmsh crashed when using
configure>template>apply
+ * High: hbreport: fix UnicodeEncodeError while print(bsc#1093564)
+
+---
Old:
crmsh-4.0.0+git.1543873923.0f9166fd.tar.bz2
New:
crmsh-4.0.0+git.1552985860.56f2db3a.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.JAvvMJ/_old 2019-03-26 15:45:26.264081524 +0100
+++ /var/tmp/diff_new_pack.JAvvMJ/_new 2019-03-26 15:45:26.268081522 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.0.0+git.1543873923.0f9166fd
+Version:4.0.0+git.1552985860.56f2db3a
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.JAvvMJ/_old 2019-03-26 15:45:26.304081505 +0100
+++ /var/tmp/diff_new_pack.JAvvMJ/_new 2019-03-26 15:45:26.304081505 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 6de02b2da5c35d14752fdc5d13ab35894b799582
\ No newline at end of file
+ 56f2db3ab753c7df0554158b718faa33ecefb081
\ No newline at end of file
++ crmsh-4.0.0+git.1543873923.0f9166fd.tar.bz2 ->
crmsh-4.0.0+git.1552985860.56f2db3a.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.0.0+git.1543873923.0f9166fd/.travis.yml
new/crmsh-4.0.0+git.1552985860.56f2db3a/.travis.yml
--- old/crmsh-4.0.0+git.1543873923.0f9166fd/.travis.yml 2018-12-03
22:52:03.0 +0100
+++ new/crmsh-4.0.0+git.1552985860.56f2db3a/.travis.yml 2019-03-19
09:57:40.0 +0100
@@ -4,6 +4,15 @@
services:
- docker
+env:
+ global:
+-
CC_TEST_REPORTER_ID=a2579335b631ec35473874d7bb4fe983025c0287cea89c9dc34c35f98ee3963d
+
+before_script:
+ - curl -L
https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64
> ./cc-test-reporter
+ - chmod +x ./cc-test-reporter
+ - ./cc-test-reporter before-build
+
before_install:
- docker pull krig/crmsh:latest
@@ -12,3 +21,6 @@
after_failure:
- sudo cat $TRAVIS_BUILD_DIR/crmtestout/regression.out
$TRAVIS_BUILD_DIR/crmtestout/crm.*
+
+after_script:
+ - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1543873923.0f9166fd/crmsh/bootstrap.py
new/crmsh-4.0.0+git.1552985860.56f2db3a/crmsh/bootstrap.py
--- old/crmsh-4.0.0+git.1543873923.0f9166fd/crmsh/bootstrap.py 2018-12-03
22:52:03.0 +0100
+++ new/crmsh-4.0.0+git.1552985860.56f2db3a/crmsh/bootstrap.py 2019-03-19
09:57:40.0 +0100
@@ -96,7 +96,7 @@
Log and display a warning message.
"""
log("WARNING: {}".format(" ".join(str(arg) for arg in args)))
-print(term.render(clidisplay.warn("! {}".format(" ".join(str(arg) for arg
in args)
+print(term.render(clidisplay.warn("WARNING: {}".format(" ".join(str(arg)
for arg in args)
@utils.memoize
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1543873923.0f9166fd/crmsh/cibconfig.py
new/crmsh-4.0.0+git.1552985860.56f2db3a/crmsh/cibconfig.py
--- old/crmsh-4.0.0+git.1543873923.0f9166fd/crmsh/cibconfig.py 2018-12-03
22:52:03.0 +0100
+++
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2019-02-08 12:11:11
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.28833 (New)
Package is "crmsh"
Fri Feb 8 12:11:11 2019 rev:154 rq:672100 version:4.0.0+git.1543873923.0f9166fd
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2018-12-06
12:19:19.565390433 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.28833/crmsh.changes 2019-02-08
12:11:15.585517474 +0100
@@ -1,0 +2,6 @@
+Wed Feb 6 07:45:26 UTC 2019 - kgronl...@suse.com
+
+- Avoid touching files to make build more reproducible
+- Install bash completion to correct location
+
+---
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.LLzUHe/_old 2019-02-08 12:11:16.673517066 +0100
+++ /var/tmp/diff_new_pack.LLzUHe/_new 2019-02-08 12:11:16.673517066 +0100
@@ -1,7 +1,7 @@
#
# spec file for package crmsh
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -142,23 +142,12 @@
%prep
%setup -q
-touch -r doc/crm.8.adoc{,.timestamp}
# replace the shebang in all the scripts
# with ${_bindir}/python3
find . -type f -exec perl -pi -e 'BEGIN{undef
$/};s[^#\!/usr/bin/python[3]?][#\!%{_bindir}/python3]' {} \;
find . -type f -exec perl -pi -e 'BEGIN{undef $/};s[^#\!/usr/bin/env
python[3]?][#\!%{_bindir}/python3]' {} \;
-# Force the local time
-#
-# 'hg archive' sets the file date to the date of the last commit.
-# This can result in files having been created in the future
-# when building on machines in timezones 'behind' the one the
-# commit occurred in - which seriously confuses 'make'
-find . -mtime -0 -exec touch \{\} \;
-# keep the .adoc mtime because it gets embedded in crm.8.html
-touch -r doc/crm.8.adoc{.timestamp,}
-
%build
./autogen.sh
@@ -180,7 +169,7 @@
%install
make DESTDIR=%{buildroot} docdir=%{crmsh_docdir} install
-install -Dm0644 contrib/bash_completion.sh
%{buildroot}%{_sysconfdir}/bash_completion.d/crm.sh
+install -Dm0644 contrib/bash_completion.sh
%{buildroot}%{_datadir}/bash-completion/completions/crm.sh
if [ -f %{buildroot}%{_bindir}/crm ]; then
install -Dm0755 %{buildroot}%{_bindir}/crm %{buildroot}%{_sbindir}/crm
rm %{buildroot}%{_bindir}/crm
@@ -237,7 +226,7 @@
%dir %{crmsh_docdir}
%dir %{crmsh_docdir}/contrib
%dir %attr (770, %{uname}, %{gname}) %{_var}/cache/crm
-%config %{_sysconfdir}/bash_completion.d/crm.sh
+%{_datadir}/bash-completion/completions/crm.sh
%files scripts
%defattr(-,root,root)
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2018-12-06 12:19:19
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.19453 (New)
Package is "crmsh"
Thu Dec 6 12:19:19 2018 rev:153 rq:61 version:4.0.0+git.1543873923.0f9166fd
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2018-12-04
20:57:38.156632861 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.19453/crmsh.changes 2018-12-06
12:19:19.565390433 +0100
@@ -1,0 +2,6 @@
+Thu Dec 06 08:57:18 UTC 2018 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1543873923.0f9166fd:
+ * medium: cibverify: Increase log level for verification (bsc#1116559)
+
+---
Old:
crmsh-4.0.0+git.1542103310.dd114188.tar.bz2
New:
crmsh-4.0.0+git.1543873923.0f9166fd.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.jzwHQW/_old 2018-12-06 12:19:20.049389914 +0100
+++ /var/tmp/diff_new_pack.jzwHQW/_new 2018-12-06 12:19:20.049389914 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.0.0+git.1542103310.dd114188
+Version:4.0.0+git.1543873923.0f9166fd
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.jzwHQW/_old 2018-12-06 12:19:20.081389880 +0100
+++ /var/tmp/diff_new_pack.jzwHQW/_new 2018-12-06 12:19:20.081389880 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- dc3c30c2913a836aab8472aee695337231bd8400
\ No newline at end of file
+ 6de02b2da5c35d14752fdc5d13ab35894b799582
\ No newline at end of file
++ crmsh-4.0.0+git.1542103310.dd114188.tar.bz2 ->
crmsh-4.0.0+git.1543873923.0f9166fd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1542103310.dd114188/crmsh/cibverify.py
new/crmsh-4.0.0+git.1543873923.0f9166fd/crmsh/cibverify.py
--- old/crmsh-4.0.0+git.1542103310.dd114188/crmsh/cibverify.py 2018-11-13
11:01:50.0 +0100
+++ new/crmsh-4.0.0+git.1543873923.0f9166fd/crmsh/cibverify.py 2018-12-03
22:52:03.0 +0100
@@ -6,7 +6,7 @@
from .msg import err_buf
-cib_verify = "crm_verify --verbose -p"
+cib_verify = "crm_verify -VV -p"
VALIDATE_RE = re.compile(r"^Entity: line (\d)+: element (\w+): " +
r"Relax-NG validity error : (.+)$")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1542103310.dd114188/test/testcases/common.excl
new/crmsh-4.0.0+git.1543873923.0f9166fd/test/testcases/common.excl
--- old/crmsh-4.0.0+git.1542103310.dd114188/test/testcases/common.excl
2018-11-13 11:01:50.0 +0100
+++ new/crmsh-4.0.0+git.1543873923.0f9166fd/test/testcases/common.excl
2018-12-03 22:52:03.0 +0100
@@ -13,7 +13,7 @@
.EXT crm_resource --list-ocf-alternatives Dummy
^\.EXT crmd version
^\.EXT cibadmin \-Ql
-^\.EXT crm_verify \-\-verbose \-p
+^\.EXT crm_verify \-VV \-p
^\.EXT cibadmin \-p \-P
^\.EXT crm_diff \-\-help
^\.EXT crm_diff \-o [^ ]+ \-n \-
@@ -22,3 +22,4 @@
^\.EXT sed ["][^"]+
^\.EXT [a-zA-Z]+ validate-all
^[ ]+File ["][^"]+
+^ERROR\: ([0-9]+\: )?\(cluster\_status\) warning\: Fencing and resource
management disabled due to lack of quorum
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2018-12-04 20:57:27
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.19453 (New)
Package is "crmsh"
Tue Dec 4 20:57:27 2018 rev:152 rq:653721 version:4.0.0+git.1542103310.dd114188
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2018-10-08
17:51:00.274057139 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.19453/crmsh.changes 2018-12-04
20:57:38.156632861 +0100
@@ -1,0 +2,14 @@
+Wed Nov 14 09:24:34 UTC 2018 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1542103310.dd114188:
+ * high: cibconfig: Normalize - to _ in param names (bsc#579)
+ * medium: ra: Handle obsoletes attribute (bsc#579)
+
+---
+Thu Nov 01 12:51:02 UTC 2018 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1540390310.315a48ed:
+ * ui_cluster: restart cluster is added (bsc#1052088)
+ * auto-commit enabling/disabling maintenance mode for a whole cluster
(bsc#1112593)
+
+---
Old:
crmsh-4.0.0+git.1539006450.f80a6308.tar.bz2
New:
crmsh-4.0.0+git.1542103310.dd114188.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.GD2645/_old 2018-12-04 20:57:38.784632168 +0100
+++ /var/tmp/diff_new_pack.GD2645/_new 2018-12-04 20:57:38.788632164 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.0.0+git.1539006450.f80a6308
+Version:4.0.0+git.1542103310.dd114188
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.GD2645/_old 2018-12-04 20:57:38.832632115 +0100
+++ /var/tmp/diff_new_pack.GD2645/_new 2018-12-04 20:57:38.832632115 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- d0111f9f688b9d5eeb7ad505efb1abd3d0cf6ebc
\ No newline at end of file
+ dc3c30c2913a836aab8472aee695337231bd8400
\ No newline at end of file
++ crmsh-4.0.0+git.1539006450.f80a6308.tar.bz2 ->
crmsh-4.0.0+git.1542103310.dd114188.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1539006450.f80a6308/crmsh/cibconfig.py
new/crmsh-4.0.0+git.1542103310.dd114188/crmsh/cibconfig.py
--- old/crmsh-4.0.0+git.1539006450.f80a6308/crmsh/cibconfig.py 2018-10-08
15:47:30.0 +0200
+++ new/crmsh-4.0.0+git.1542103310.dd114188/crmsh/cibconfig.py 2018-11-13
11:01:50.0 +0100
@@ -911,6 +911,9 @@
'''
pass
+def normalize_parameters(self):
+pass
+
def _repr_cli_head(self, format_mode):
'implemented in subclasses'
pass
@@ -1496,6 +1499,23 @@
self.set_updated()
return new_op_node
+def normalize_parameters(self):
+"""
+Normalize parameter names:
+If a parameter "foo-bar" is set but the
+agent doesn't have a parameter "foo-bar",
+and instead has a parameter "foo_bar", then
+change the name to set the value of "foo_bar"
+instead.
+"""
+r_node = self.node
+if self.obj_type == "primitive":
+r_node = reduce_primitive(self.node)
+if r_node is None:
+return
+ra = get_ra(r_node)
+ra.normalize_parameters(r_node)
+
def check_sanity(self):
'''
Check operation timeouts and if all required parameters
@@ -3355,6 +3375,7 @@
topnode.append(obj.node)
self.cib_objects.append(obj)
copy_nvpairs(obj.node, node)
+obj.normalize_parameters()
obj.set_updated()
return obj
@@ -3682,6 +3703,7 @@
return None
pnode.append(node)
self._redirect_children_constraints(obj)
+obj.normalize_parameters()
if not obj.cli_use_validate():
self.nocli_warn = True
obj.nocli = True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.0.0+git.1539006450.f80a6308/crmsh/ra.py
new/crmsh-4.0.0+git.1542103310.dd114188/crmsh/ra.py
--- old/crmsh-4.0.0+git.1539006450.f80a6308/crmsh/ra.py 2018-10-08
15:47:30.0 +0200
+++ new/crmsh-4.0.0+git.1542103310.dd114188/crmsh/ra.py 2018-11-13
11:01:50.0 +0100
@@ -414,7 +414,7 @@
name = c.get("name")
if not name:
continue
-required = c.get("required") if not
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2018-10-08 17:49:40
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Mon Oct 8 17:49:40 2018 rev:151 rq:640627 version:4.0.0+git.1539006450.f80a6308
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2018-10-04
19:01:02.559231794 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2018-10-08
17:51:00.274057139 +0200
@@ -1,0 +2,7 @@
+Mon Oct 08 13:47:39 UTC 2018 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1539006450.f80a6308:
+ * medium: bootstrap: Skip netmask check on GCP (bsc#1106946)
+ * medium: utils: Detect local IP on GCP (bsc#1106946)
+
+---
Old:
crmsh-4.0.0+git.1538492109.4b1170b0.tar.bz2
New:
crmsh-4.0.0+git.1539006450.f80a6308.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.QcBYH7/_old 2018-10-08 17:51:00.666056639 +0200
+++ /var/tmp/diff_new_pack.QcBYH7/_new 2018-10-08 17:51:00.670056634 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.0.0+git.1538492109.4b1170b0
+Version:4.0.0+git.1539006450.f80a6308
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.QcBYH7/_old 2018-10-08 17:51:00.722056567 +0200
+++ /var/tmp/diff_new_pack.QcBYH7/_new 2018-10-08 17:51:00.722056567 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 16b0d4178d68d1f61377f4db12a53617d21f6e84
\ No newline at end of file
+ d0111f9f688b9d5eeb7ad505efb1abd3d0cf6ebc
\ No newline at end of file
++ crmsh-4.0.0+git.1538492109.4b1170b0.tar.bz2 ->
crmsh-4.0.0+git.1539006450.f80a6308.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1538492109.4b1170b0/crmsh/bootstrap.py
new/crmsh-4.0.0+git.1539006450.f80a6308/crmsh/bootstrap.py
--- old/crmsh-4.0.0+git.1538492109.4b1170b0/crmsh/bootstrap.py 2018-10-02
16:55:09.0 +0200
+++ new/crmsh-4.0.0+git.1539006450.f80a6308/crmsh/bootstrap.py 2018-10-08
15:47:30.0 +0200
@@ -1725,17 +1725,19 @@
if not ringXaddr:
error("No value for ring{}".format(i))
-_, outp = utils.get_stdout("ip addr show")
-tmp = re.findall(r' {}/[0-9]+ '.format(ringXaddr), outp,
re.M)[0].strip()
-peer_ip =
corosync.get_value("nodelist.node.ring{}_addr".format(i))
-# peer ring0_addr and local ring0_addr must be configured in
the same network
-if not utils.ip_in_network(peer_ip, tmp):
-errmsg = "Peer IP {} is not in the same network:
{}".format(peer_ip, tmp)
-if _context.yes_to_all:
-error(errmsg)
-else:
-print(term.render(clidisplay.error(errmsg)))
-continue
+# this check does not work on GCP (bsc#1106946)
+if utils.detect_cloud() != "google-cloud-platform":
+_, outp = utils.get_stdout("ip addr show")
+tmp = re.findall(r' {}/[0-9]+ '.format(ringXaddr), outp,
re.M)[0].strip()
+peer_ip =
corosync.get_value("nodelist.node.ring{}_addr".format(i))
+# peer ring0_addr and local ring0_addr must be configured
in the same network
+if not utils.ip_in_network(peer_ip, tmp):
+errmsg = "Peer IP {} is not in the same network:
{}".format(peer_ip, tmp)
+if _context.yes_to_all:
+error(errmsg)
+else:
+print(term.render(clidisplay.error(errmsg)))
+continue
ringXaddr_res.append(ringXaddr)
break
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.0.0+git.1538492109.4b1170b0/crmsh/utils.py
new/crmsh-4.0.0+git.1539006450.f80a6308/crmsh/utils.py
--- old/crmsh-4.0.0+git.1538492109.4b1170b0/crmsh/utils.py 2018-10-02
16:55:09.0 +0200
+++ new/crmsh-4.0.0+git.1539006450.f80a6308/crmsh/utils.py 2018-10-08
15:47:30.0 +0200
@@ -120,6 +120,10 @@
info[1], info[2], info[3] = src, sp[0], 32
if info[0] is None:
raise
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2018-10-04 19:00:58
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Thu Oct 4 19:00:58 2018 rev:150 rq:639615 version:4.0.0+git.1538492109.4b1170b0
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2018-09-28
08:53:13.937743671 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2018-10-04
19:01:02.559231794 +0200
@@ -1,0 +2,9 @@
+Tue Oct 02 14:55:31 UTC 2018 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1538492109.4b1170b0:
+ * medium: bootstrap: Correctly check rrp_mode flag (bsc#1110463)
+ * medium: bootstrap: Pick first match for multiple routes (bsc#1106946)
+ * medium: utils: Use cloud metadata service to discover IP (bsc#1106946)
+ * Fix: bootstrap: change default ip address way for both mcast and
unicat(bsc#1109975,bsc#1109974)
+
+---
Old:
crmsh-4.0.0+git.1537967262.68a0bd1e.tar.bz2
New:
crmsh-4.0.0+git.1538492109.4b1170b0.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.4stBX7/_old 2018-10-04 19:01:03.075231253 +0200
+++ /var/tmp/diff_new_pack.4stBX7/_new 2018-10-04 19:01:03.075231253 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.0.0+git.1537967262.68a0bd1e
+Version:4.0.0+git.1538492109.4b1170b0
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.4stBX7/_old 2018-10-04 19:01:03.103231224 +0200
+++ /var/tmp/diff_new_pack.4stBX7/_new 2018-10-04 19:01:03.107231220 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 8ea00b67525414e1682ba1eced82b93281692904
\ No newline at end of file
+ 16b0d4178d68d1f61377f4db12a53617d21f6e84
\ No newline at end of file
++ crmsh-4.0.0+git.1537967262.68a0bd1e.tar.bz2 ->
crmsh-4.0.0+git.1538492109.4b1170b0.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1537967262.68a0bd1e/crmsh/bootstrap.py
new/crmsh-4.0.0+git.1538492109.4b1170b0/crmsh/bootstrap.py
--- old/crmsh-4.0.0+git.1537967262.68a0bd1e/crmsh/bootstrap.py 2018-09-26
15:07:42.0 +0200
+++ new/crmsh-4.0.0+git.1538492109.4b1170b0/crmsh/bootstrap.py 2018-10-02
16:55:09.0 +0200
@@ -235,6 +235,21 @@
status_done()
+def pick_default_value(default_list, prev_list):
+"""
+Provide default value for function 'prompt_for_string'.
+Make sure give different default value in multi-ring mode.
+
+Parameters:
+* default_list - default value list for config item
+* prev_list- previous value for config item in multi-ring mode
+"""
+for value in default_list:
+if value not in prev_list:
+return value
+return ""
+
+
def start_service(service):
"""
Start and enable systemd service
@@ -886,11 +901,6 @@
def init_corosync_unicast():
-def pick_default_value(vlist, ilist):
-# give a different value for second config items
-if len(ilist) == 1:
-vlist.remove(ilist[0])
-return vlist[0]
if _context.yes_to_all:
status("Configuring corosync (unicast)")
@@ -911,27 +921,18 @@
mcastport_res = []
default_ports = ["5405", "5407"]
two_rings = False
-default_networks = []
-if _context.ipv6:
-network_list = []
-all_ = utils.network_v6_all()
-for item in all_.values():
-network_list.extend(item)
-default_networks = [utils.get_ipv6_network(x) for x in network_list]
-else:
-network_list = utils.network_all()
-if len(network_list) > 1:
-default_networks = [_context.ip_network,
network_list.remove(_context.ip_network)]
-else:
-default_networks = [_context.ip_network]
-if not default_networks:
+local_iplist = utils.ip_in_local(_context.ipv6)
+len_iplist = len(local_iplist)
+if len_iplist == 0:
error("No network configured at {}!".format(utils.this_node()))
+default_ip = [_context.ip_address] + [ip for ip in local_iplist if ip !=
_context.ip_address]
+
for i in 0, 1:
ringXaddr = prompt_for_string('Address for ring{}'.format(i),
r'([0-9]+\.){3}[0-9]+|[0-9a-fA-F]{1,4}:',
- _context.ip_address if i == 0 and
_context.ip_address
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2018-09-28 08:53:11
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Fri Sep 28 08:53:11 2018 rev:149 rq:638401 version:4.0.0+git.1537967262.68a0bd1e
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2018-09-25
15:44:14.517173899 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2018-09-28
08:53:13.937743671 +0200
@@ -1,0 +2,6 @@
+Wed Sep 26 13:10:43 UTC 2018 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1537967262.68a0bd1e:
+ * Fix incorrect bindnetaddr in corosync.conf (bsc#1103833) (bsc#1103834)
+
+---
Old:
crmsh-4.0.0+git.1537860833.be41d63c.tar.bz2
New:
crmsh-4.0.0+git.1537967262.68a0bd1e.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.lh9yYv/_old 2018-09-28 08:53:14.461742913 +0200
+++ /var/tmp/diff_new_pack.lh9yYv/_new 2018-09-28 08:53:14.465742907 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.0.0+git.1537860833.be41d63c
+Version:4.0.0+git.1537967262.68a0bd1e
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.lh9yYv/_old 2018-09-28 08:53:14.505742850 +0200
+++ /var/tmp/diff_new_pack.lh9yYv/_new 2018-09-28 08:53:14.505742850 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- c393b5c661a87f1f9e2bc03be587051aedc33220
\ No newline at end of file
+ 8ea00b67525414e1682ba1eced82b93281692904
\ No newline at end of file
++ crmsh-4.0.0+git.1537860833.be41d63c.tar.bz2 ->
crmsh-4.0.0+git.1537967262.68a0bd1e.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/bootstrap.py
new/crmsh-4.0.0+git.1537967262.68a0bd1e/crmsh/bootstrap.py
--- old/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/bootstrap.py 2018-09-25
09:33:53.0 +0200
+++ new/crmsh-4.0.0+git.1537967262.68a0bd1e/crmsh/bootstrap.py 2018-09-26
15:07:42.0 +0200
@@ -924,7 +924,7 @@
if len(network_list) > 1:
default_networks = [_context.ip_network,
network_list.remove(_context.ip_network)]
else:
-default_networks = _context.ip_network
+default_networks = [_context.ip_network]
if not default_networks:
error("No network configured at {}!".format(utils.this_node()))
@@ -1015,7 +1015,7 @@
if len(network_list) > 1:
default_networks = [_context.ip_network,
network_list.remove(_context.ip_network)]
else:
-default_networks = _context.ip_network
+default_networks = [_context.ip_network]
if not default_networks:
error("No network configured at {}!".format(utils.this_node()))
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2018-09-25 15:44:02
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Tue Sep 25 15:44:02 2018 rev:148 rq:637867 version:4.0.0+git.1537860833.be41d63c
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2018-08-20
16:19:01.736789318 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2018-09-25
15:44:14.517173899 +0200
@@ -1,0 +2,14 @@
+Tue Sep 25 07:44:44 UTC 2018 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1537860833.be41d63c:
+ * fix: bootstrap: non interactive unicast cluster init and join(bsc#1109172)
+ * medium: bootstrap: Disable strict host key checking on all ssh invocations
+ * medium: support ocfs2 log collecting
+ * hbreport: process name change for pacemaker 2.0(bsc#1106052)
+ * Fix: bootstrap: "-i" option doesn't work(bsc#1103833, bsc#1103834)
+ * Low: bootstrap: No warning message when using '-q'
+ * high: ra: Support Pacemaker 2.0 daemon names
+ * high: config: Locate pacemaker daemons more intelligently (#67)
(bsc#1096783)
+ * Fix: TypeError in logparser.py(bsc#1093433)
+
+---
Old:
crmsh-4.0.0+git.1526547258.54aafa1d.tar.bz2
New:
crmsh-4.0.0+git.1537860833.be41d63c.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.G8wnek/_old 2018-09-25 15:44:15.029173352 +0200
+++ /var/tmp/diff_new_pack.G8wnek/_new 2018-09-25 15:44:15.037173344 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.0.0+git.1526547258.54aafa1d
+Version:4.0.0+git.1537860833.be41d63c
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.G8wnek/_old 2018-09-25 15:44:15.077173301 +0200
+++ /var/tmp/diff_new_pack.G8wnek/_new 2018-09-25 15:44:15.077173301 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- ce8241d2ea413dd5a95eec87f57381ee25077f1c
\ No newline at end of file
+ c393b5c661a87f1f9e2bc03be587051aedc33220
\ No newline at end of file
++ crmsh-4.0.0+git.1526547258.54aafa1d.tar.bz2 ->
crmsh-4.0.0+git.1537860833.be41d63c.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.0.0+git.1526547258.54aafa1d/Dockerfile
new/crmsh-4.0.0+git.1537860833.be41d63c/Dockerfile
--- old/crmsh-4.0.0+git.1526547258.54aafa1d/Dockerfile 2018-05-17
10:54:18.0 +0200
+++ new/crmsh-4.0.0+git.1537860833.be41d63c/Dockerfile 2018-09-25
09:33:53.0 +0200
@@ -1,4 +1,4 @@
-FROM opensuse:42.3
+FROM opensuse/leap:15
MAINTAINER Kristoffer Gronlund version: 0.5
ENV container docker
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/bootstrap.py
new/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/bootstrap.py
--- old/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/bootstrap.py 2018-05-17
10:54:18.0 +0200
+++ new/crmsh-4.0.0+git.1537860833.be41d63c/crmsh/bootstrap.py 2018-09-25
09:33:53.0 +0200
@@ -96,8 +96,7 @@
Log and display a warning message.
"""
log("WARNING: {}".format(" ".join(str(arg) for arg in args)))
-if not _context.quiet:
-print(term.render(clidisplay.warn("! {}".format(" ".join(str(arg) for
arg in args)
+print(term.render(clidisplay.warn("! {}".format(" ".join(str(arg) for arg
in args)
@utils.memoize
@@ -856,7 +855,7 @@
warn(" Address already in use: {}".format(addr))
return False
for net in all_:
-if addr in utils.Network(net):
+if utils.ip_in_network(addr, net):
return True
warn(" Address '{}' invalid, expected one of {}".format(addr, all_))
return False
@@ -919,9 +918,13 @@
all_ = utils.network_v6_all()
for item in all_.values():
network_list.extend(item)
-default_networks = map(utils.get_ipv6_network, network_list)
+default_networks = [utils.get_ipv6_network(x) for x in network_list]
else:
-default_networks = utils.network_all()
+network_list = utils.network_all()
+if len(network_list) > 1:
+default_networks = [_context.ip_network,
network_list.remove(_context.ip_network)]
+else:
+default_networks = _context.ip_network
if not default_networks:
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2018-08-20 16:19:01
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Mon Aug 20 16:19:01 2018 rev:147 rq:629232 version:4.0.0+git.1526547258.54aafa1d
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2018-05-18
14:28:30.365042684 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2018-08-20
16:19:01.736789318 +0200
@@ -1,0 +2,5 @@
+Tue Aug 14 14:02:38 UTC 2018 - kgronl...@suse.com
+
+- Always require python3-parallax (bsc#1103832)
+
+---
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.BirDvV/_old 2018-08-20 16:19:02.184789950 +0200
+++ /var/tmp/diff_new_pack.BirDvV/_new 2018-08-20 16:19:02.184789950 +0200
@@ -51,12 +51,8 @@
Requires: /usr/bin/which
Requires: python3 >= 3.4
Requires: python3-lxml
-Requires: python3-python-dateutil
-%if 0%{?suse_version} > 1320
Requires: python3-parallax
-%else
-Requires: python-parallax
-%endif
+Requires: python3-python-dateutil
BuildRequires: python3-lxml
BuildRequires: python3-setuptools
@@ -111,11 +107,7 @@
Requires(post): procps
Requires(post): python3-python-dateutil
Requires(post): python3-nose
-%if 0%{?suse_version} > 1320
Requires(post): python3-parallax
-%else
-Requires(post): python-parallax
-%endif
Requires(post): pacemaker
%if 0%{?suse_version} > 1110
BuildArch: noarch
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2018-05-18 14:28:19
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Fri May 18 14:28:19 2018 rev:146 rq:610226 version:4.0.0+git.1526547258.54aafa1d
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2018-04-16
15:45:52.376883540 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2018-05-18
14:28:30.365042684 +0200
@@ -1,0 +2,10 @@
+Fri May 18 07:20:31 UTC 2018 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1526547258.54aafa1d:
+ * high: bash_completion: Adjust for non-interactive mode(bsc#1090304)
+ * high: utils: Parse /32 route entries
+ * low: terminal will lose cursor after type ctrl+c(bsc#1090626)
+ * low: ui_configure: Adjust prompt string after help messages(bsc#1090140)
+ * low: bootstrap: Strip spaces before some status descriptions
+
+---
Old:
crmsh-4.0.0+git.1523871649.78999e05.tar.bz2
New:
crmsh-4.0.0+git.1526547258.54aafa1d.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.lYRyob/_old 2018-05-18 14:28:30.829025657 +0200
+++ /var/tmp/diff_new_pack.lYRyob/_new 2018-05-18 14:28:30.833025510 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.0.0+git.1523871649.78999e05
+Version:4.0.0+git.1526547258.54aafa1d
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.lYRyob/_old 2018-05-18 14:28:30.865024336 +0200
+++ /var/tmp/diff_new_pack.lYRyob/_new 2018-05-18 14:28:30.865024336 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 716caabb87275117d3f2b8c550331b86b7235f0d
\ No newline at end of file
+ ce8241d2ea413dd5a95eec87f57381ee25077f1c
\ No newline at end of file
++ crmsh-4.0.0+git.1523871649.78999e05.tar.bz2 ->
crmsh-4.0.0+git.1526547258.54aafa1d.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1523871649.78999e05/contrib/bash_completion.sh
new/crmsh-4.0.0+git.1526547258.54aafa1d/contrib/bash_completion.sh
--- old/crmsh-4.0.0+git.1523871649.78999e05/contrib/bash_completion.sh
2018-04-16 11:40:49.0 +0200
+++ new/crmsh-4.0.0+git.1526547258.54aafa1d/contrib/bash_completion.sh
2018-05-17 10:54:18.0 +0200
@@ -148,7 +148,15 @@
local i=0
for x in $1; do
if [[ "$x" == "$3"* ]]; then
+if [[ "$x" =~ .*(=|:)$ ]];then
+if [[ "$x" =~ ^id=$ ]];then
+:
+else
+ COMPREPLY[i++]="$2$x"
+fi
+else
COMPREPLY[i++]="$2$x$4"
+fi
fi
done
}
@@ -209,7 +217,7 @@
*:*) : great ;;
*) pfx="${cur_%%:*}:" ;;
esac
- cur_="${cur_#*:}"
+ cur_="${cur_##*:}"
;;
esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1523871649.78999e05/crmsh/bootstrap.py
new/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/bootstrap.py
--- old/crmsh-4.0.0+git.1523871649.78999e05/crmsh/bootstrap.py 2018-04-16
11:40:49.0 +0200
+++ new/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/bootstrap.py 2018-05-17
10:54:18.0 +0200
@@ -589,9 +589,9 @@
# only try to start hawk if hawk is installed
if service_is_available("hawk.service"):
start_service("hawk.service")
-status(" Hawk cluster interface is now running. To see cluster
status, open:")
-status("https://%s:7630/; % (_context.ip_address))
-status(" Log in with username 'hacluster'%s" % (pass_msg))
+status("Hawk cluster interface is now running. To see cluster status,
open:")
+status(" https://%s:7630/; % (_context.ip_address))
+status("Log in with username 'hacluster'%s" % (pass_msg))
else:
warn("Hawk not installed - not configuring web management interface.")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1523871649.78999e05/crmsh/constants.py
new/crmsh-4.0.0+git.1526547258.54aafa1d/crmsh/constants.py
--- old/crmsh-4.0.0+git.1523871649.78999e05/crmsh/constants.py
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2018-04-16 15:45:48
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Mon Apr 16 15:45:48 2018 rev:145 rq:596962 version:4.0.0+git.1523871649.78999e05
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2018-04-13
12:50:42.097527655 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2018-04-16
15:45:52.376883540 +0200
@@ -1,0 +2,6 @@
+Mon Apr 16 09:41:09 UTC 2018 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1523871649.78999e05:
+ * doc: Fix unbalanced example marker (bsc#1075764)
+
+---
Old:
crmsh-4.0.0+git.1523435067.43bb4847.tar.bz2
New:
crmsh-4.0.0+git.1523871649.78999e05.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.cXYckS/_old 2018-04-16 15:45:53.228852731 +0200
+++ /var/tmp/diff_new_pack.cXYckS/_new 2018-04-16 15:45:53.232852587 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.0.0+git.1523435067.43bb4847
+Version:4.0.0+git.1523871649.78999e05
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.cXYckS/_old 2018-04-16 15:45:53.280850851 +0200
+++ /var/tmp/diff_new_pack.cXYckS/_new 2018-04-16 15:45:53.284850707 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 8b0eb08e2d2c6c094a69bf4428be95e0fb03b6ac
\ No newline at end of file
+ 716caabb87275117d3f2b8c550331b86b7235f0d
\ No newline at end of file
++ crmsh-4.0.0+git.1523435067.43bb4847.tar.bz2 ->
crmsh-4.0.0+git.1523871649.78999e05.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.0.0+git.1523435067.43bb4847/doc/crm.8.adoc
new/crmsh-4.0.0+git.1523871649.78999e05/doc/crm.8.adoc
--- old/crmsh-4.0.0+git.1523435067.43bb4847/doc/crm.8.adoc 2018-04-11
10:24:27.0 +0200
+++ new/crmsh-4.0.0+git.1523871649.78999e05/doc/crm.8.adoc 2018-04-16
11:40:49.0 +0200
@@ -840,7 +840,7 @@
hour. M = minute. S = second.
Examples:
-
+.
PT5M = 5 minutes later.
3D = 3 days later.
PT1H = 1 hour later.
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2018-04-13 12:50:19
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Fri Apr 13 12:50:19 2018 rev:144 rq:595775 version:4.0.0+git.1523435067.43bb4847
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2018-03-29
11:58:06.188975738 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2018-04-13
12:50:42.097527655 +0200
@@ -1,0 +2,6 @@
+Wed Apr 11 20:10:10 UTC 2018 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1523435067.43bb4847:
+ * high: hbreport: adjustment for hbreport (bsc#1088784)
+
+---
Old:
crmsh-4.0.0+git.1522278003.cd7ae188.tar.bz2
New:
crmsh-4.0.0+git.1523435067.43bb4847.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.NpqvDN/_old 2018-04-13 12:50:43.273485051 +0200
+++ /var/tmp/diff_new_pack.NpqvDN/_new 2018-04-13 12:50:43.277484906 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.0.0+git.1522278003.cd7ae188
+Version:4.0.0+git.1523435067.43bb4847
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.NpqvDN/_old 2018-04-13 12:50:43.321483312 +0200
+++ /var/tmp/diff_new_pack.NpqvDN/_new 2018-04-13 12:50:43.321483312 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 7686d0078edae58e16cf29ffdf38210e9cac37f3
\ No newline at end of file
+ 8b0eb08e2d2c6c094a69bf4428be95e0fb03b6ac
\ No newline at end of file
++ crmsh-4.0.0+git.1522278003.cd7ae188.tar.bz2 ->
crmsh-4.0.0+git.1523435067.43bb4847.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.0.0+git.1522278003.cd7ae188/crmsh/main.py
new/crmsh-4.0.0+git.1523435067.43bb4847/crmsh/main.py
--- old/crmsh-4.0.0+git.1522278003.cd7ae188/crmsh/main.py 2018-03-29
01:00:03.0 +0200
+++ new/crmsh-4.0.0+git.1523435067.43bb4847/crmsh/main.py 2018-04-11
10:24:27.0 +0200
@@ -367,6 +367,7 @@
if config.core.debug:
import traceback
traceback.print_exc()
+sys.stdout.flush()
common_err(str(e))
# vim:ts=4:sw=4:et:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1522278003.cd7ae188/crmsh/ui_context.py
new/crmsh-4.0.0+git.1523435067.43bb4847/crmsh/ui_context.py
--- old/crmsh-4.0.0+git.1522278003.cd7ae188/crmsh/ui_context.py 2018-03-29
01:00:03.0 +0200
+++ new/crmsh-4.0.0+git.1523435067.43bb4847/crmsh/ui_context.py 2018-04-11
10:24:27.0 +0200
@@ -77,12 +77,14 @@
if config.core.debug or options.regression_tests:
import traceback
traceback.print_exc()
+sys.stdout.flush()
common_err("%s: %s" % (self.get_qualified_name(), msg))
rv = False
except IOError as msg:
if config.core.debug or options.regression_tests:
import traceback
traceback.print_exc()
+sys.stdout.flush()
common_err("%s: %s" % (self.get_qualified_name(), msg))
rv = False
if cmd or (rv is False):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1522278003.cd7ae188/crmsh/ui_resource.py
new/crmsh-4.0.0+git.1523435067.43bb4847/crmsh/ui_resource.py
--- old/crmsh-4.0.0+git.1522278003.cd7ae188/crmsh/ui_resource.py
2018-03-29 01:00:03.0 +0200
+++ new/crmsh-4.0.0+git.1523435067.43bb4847/crmsh/ui_resource.py
2018-04-11 10:24:27.0 +0200
@@ -207,11 +207,9 @@
Implements the refresh and cleanup commands.
"""
if rsc == "force":
-rsc = None
-force = True
+rsc, force = None, True
if node == "force":
-node = None
-force = True
+node, force = None, True
cmd = ["crm_resource", "--" + action]
if rsc:
if not utils.is_name_sane(rsc):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.0.0+git.1522278003.cd7ae188/crmsh/utils.py
new/crmsh-4.0.0+git.1523435067.43bb4847/crmsh/utils.py
--- old/crmsh-4.0.0+git.1522278003.cd7ae188/crmsh/utils.py 2018-03-29
01:00:03.0 +0200
+++
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2018-03-29 11:57:58
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Thu Mar 29 11:57:58 2018 rev:143 rq:592143 version:4.0.0+git.1522278003.cd7ae188
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2018-02-27
17:00:16.599015133 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2018-03-29
11:58:06.188975738 +0200
@@ -1,0 +2,6 @@
+Wed Mar 28 23:00:23 UTC 2018 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1522278003.cd7ae188:
+ * high: ui_resource: Undeprecate refresh and remove reprobe (bsc#1084736)
+
+---
Old:
crmsh-4.0.0+git.1519721966.9abd841c.tar.bz2
New:
crmsh-4.0.0+git.1522278003.cd7ae188.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.B5n5f0/_old 2018-03-29 11:58:08.912877430 +0200
+++ /var/tmp/diff_new_pack.B5n5f0/_new 2018-03-29 11:58:08.916877286 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.0.0+git.1519721966.9abd841c
+Version:4.0.0+git.1522278003.cd7ae188
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.B5n5f0/_old 2018-03-29 11:58:08.956875842 +0200
+++ /var/tmp/diff_new_pack.B5n5f0/_new 2018-03-29 11:58:08.956875842 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 9abd841ca08a609923c8406584a112900bb27262
\ No newline at end of file
+ 7686d0078edae58e16cf29ffdf38210e9cac37f3
\ No newline at end of file
++ crmsh-4.0.0+git.1519721966.9abd841c.tar.bz2 ->
crmsh-4.0.0+git.1522278003.cd7ae188.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1519721966.9abd841c/.vscode/settings.json
new/crmsh-4.0.0+git.1522278003.cd7ae188/.vscode/settings.json
--- old/crmsh-4.0.0+git.1519721966.9abd841c/.vscode/settings.json
1970-01-01 01:00:00.0 +0100
+++ new/crmsh-4.0.0+git.1522278003.cd7ae188/.vscode/settings.json
2018-03-29 01:00:03.0 +0200
@@ -0,0 +1,6 @@
+{
+"python.linting.pylintEnabled": true,
+"python.linting.flake8Enabled": false,
+"python.linting.enabled": true,
+"python.pythonPath": "/usr/bin/python3"
+}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.0.0+git.1519721966.9abd841c/AUTHORS
new/crmsh-4.0.0+git.1522278003.cd7ae188/AUTHORS
--- old/crmsh-4.0.0+git.1519721966.9abd841c/AUTHORS 2018-02-27
09:59:26.0 +0100
+++ new/crmsh-4.0.0+git.1522278003.cd7ae188/AUTHORS 2018-03-29
01:00:03.0 +0200
@@ -5,10 +5,13 @@
Adam Spiers
Andrei Maruha
Andrew Beekhof
+ Bin Liu
Borislav Borisov
Christian Seiler
Daniel Hoffend
Dejan Muhamedagic
+ dougcahill
+ Eric Ren
Federica Teodori
Florian Haas
Goldwyn Rodrigues
@@ -29,6 +32,7 @@
Nate Clark
nozawat
Pedro Salgado
+ Peter Schwindt
Richard B Winters
seabres
Tim Serong
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1519721966.9abd841c/crmsh/bootstrap.py
new/crmsh-4.0.0+git.1522278003.cd7ae188/crmsh/bootstrap.py
--- old/crmsh-4.0.0+git.1519721966.9abd841c/crmsh/bootstrap.py 2018-02-27
09:59:26.0 +0100
+++ new/crmsh-4.0.0+git.1522278003.cd7ae188/crmsh/bootstrap.py 2018-03-29
01:00:03.0 +0200
@@ -1799,17 +1799,18 @@
if nodelist is None:
for v in corosync.get_values("quorum.expected_votes"):
expected_votes = v
-#for node >= 2, expected_votes = nodecount + device_votes
-#asume nodecount is N, for
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2018-02-27 16:59:58
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Tue Feb 27 16:59:58 2018 rev:142 rq:580540 version:4.0.0+git.1519721966.9abd841c
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2018-02-14
10:50:55.295196305 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2018-02-27
17:00:16.599015133 +0100
@@ -1,0 +2,6 @@
+Tue Feb 27 09:55:07 UTC 2018 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1519721966.9abd841c:
+ * low: bootstrap: Updated authkey generation (bsc#1077389)
+
+---
@@ -5 +11 @@
- * fix: bootstrap: Create pacemaker_remote authkey(#bsc 1077389)
+ * fix: bootstrap: Create pacemaker_remote authkey (bsc#1077389)
Old:
crmsh-4.0.0+git.1518510059.7a6f94e6.tar.bz2
New:
crmsh-4.0.0+git.1519721966.9abd841c.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.wtjnDW/_old 2018-02-27 17:00:17.870969175 +0100
+++ /var/tmp/diff_new_pack.wtjnDW/_new 2018-02-27 17:00:17.882968741 +0100
@@ -34,9 +34,9 @@
Name: crmsh
Summary:High Availability cluster command-line interface
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.0.0+git.1518510059.7a6f94e6
+Version:4.0.0+git.1519721966.9abd841c
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.wtjnDW/_old 2018-02-27 17:00:17.962965852 +0100
+++ /var/tmp/diff_new_pack.wtjnDW/_new 2018-02-27 17:00:17.966965706 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 7a6f94e6613a604a540956ff56324a788976b7db
\ No newline at end of file
+ 9abd841ca08a609923c8406584a112900bb27262
\ No newline at end of file
++ crmsh-4.0.0+git.1518510059.7a6f94e6.tar.bz2 ->
crmsh-4.0.0+git.1519721966.9abd841c.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1518510059.7a6f94e6/crmsh/bootstrap.py
new/crmsh-4.0.0+git.1519721966.9abd841c/crmsh/bootstrap.py
--- old/crmsh-4.0.0+git.1518510059.7a6f94e6/crmsh/bootstrap.py 2018-02-13
09:20:59.0 +0100
+++ new/crmsh-4.0.0+git.1519721966.9abd841c/crmsh/bootstrap.py 2018-02-27
09:59:26.0 +0100
@@ -623,6 +623,32 @@
tf.write(ff.read())
+def rmfile(path, ignore_errors=False):
+"""
+Try to remove the given file, and
+report an error on failure
+"""
+try:
+os.remove(path)
+except os.error as err:
+if not ignore_errors:
+error("Failed to remove {}: {}".format(path, err))
+
+
+def mkdirs_owned(dirs, mode=0o777, uid=-1, gid=-1):
+"""
+Create directory path, setting the mode and
+ownership of the leaf directory to mode/uid/gid.
+"""
+if not os.path.exists(dirs):
+try:
+os.makedirs(dirs, mode)
+except OSError as err:
+error("Failed to create {}: {}".format(dirs, err))
+if uid != -1 or gid != -1:
+utils.chown(dirs, uid, gid)
+
+
def init_ssh():
"""
Configure passwordless SSH.
@@ -632,10 +658,7 @@
if os.path.exists("/root/.ssh/id_rsa"):
if not confirm("/root/.ssh/id_rsa already exists - overwrite?"):
return
-try:
-os.remove("/root/.ssh/id_rsa")
-except os.error:
-error("Failed to remove /root/.ssh/id_rsa")
+rmfile("/root/.ssh/id_rsa")
status("Generating SSH key")
invoke("ssh-keygen -q -f /root/.ssh/id_rsa -C 'Cluster Internal' -N ''")
append("/root/.ssh/id_rsa.pub", "/root/.ssh/authorized_keys")
@@ -741,10 +764,7 @@
if os.path.exists(COROSYNC_AUTH):
if not confirm("%s already exists - overwrite?" % (COROSYNC_AUTH)):
return
-try:
-os.remove(COROSYNC_AUTH)
-except os.error:
-error("Failed to remove %s" % (COROSYNC_AUTH))
+rmfile(COROSYNC_AUTH)
invoke("corosync-keygen -l")
@@ -755,17 +775,14 @@
if os.path.exists(PCMK_REMOTE_AUTH):
if not confirm("%s already exists - overwrite?" % (PCMK_REMOTE_AUTH)):
return
-try:
-os.remove(PCMK_REMOTE_AUTH)
-except os.error:
-error("Failed to remove %s" % (PCMK_REMOTE_AUTH))
+rmfile(PCMK_REMOTE_AUTH)
pcmk_remote_dir = os.path.dirname(PCMK_REMOTE_AUTH)
-if not os.path.exists(pcmk_remote_dir):
-
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2018-02-14 10:50:54
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Wed Feb 14 10:50:54 2018 rev:141 rq:576001 version:4.0.0+git.1518510059.7a6f94e6
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2018-02-09
15:48:02.158335569 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2018-02-14
10:50:55.295196305 +0100
@@ -1,0 +2,9 @@
+Tue Feb 13 08:21:19 UTC 2018 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1518510059.7a6f94e6:
+ * fix: bootstrap: Create pacemaker_remote authkey(#bsc 1077389)
+ * low: bootstrap: Always ask whether to use sbd
+ * fix: hb_report: got the right file decompressor(bsc#1077553)
+ * medium: hb_report: Avoid calling deprecated network utilities (bsc#1073638)
+
+---
Old:
crmsh-4.0.0+git.1518073467.76fb6a0b.tar.bz2
New:
crmsh-4.0.0+git.1518510059.7a6f94e6.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.yz9e04/_old 2018-02-14 10:50:56.035169674 +0100
+++ /var/tmp/diff_new_pack.yz9e04/_new 2018-02-14 10:50:56.039169530 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:4.0.0+git.1518073467.76fb6a0b
+Version:4.0.0+git.1518510059.7a6f94e6
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.yz9e04/_old 2018-02-14 10:50:56.083167947 +0100
+++ /var/tmp/diff_new_pack.yz9e04/_new 2018-02-14 10:50:56.083167947 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 76fb6a0be7c121e971907d98af7e4b3bbc6f9548
\ No newline at end of file
+ 7a6f94e6613a604a540956ff56324a788976b7db
\ No newline at end of file
++ crmsh-4.0.0+git.1518073467.76fb6a0b.tar.bz2 ->
crmsh-4.0.0+git.1518510059.7a6f94e6.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1518073467.76fb6a0b/crmsh/bootstrap.py
new/crmsh-4.0.0+git.1518510059.7a6f94e6/crmsh/bootstrap.py
--- old/crmsh-4.0.0+git.1518073467.76fb6a0b/crmsh/bootstrap.py 2018-02-08
08:04:27.0 +0100
+++ new/crmsh-4.0.0+git.1518510059.7a6f94e6/crmsh/bootstrap.py 2018-02-13
09:20:59.0 +0100
@@ -37,6 +37,8 @@
SYSCONFIG_SBD = "/etc/sysconfig/sbd"
SYSCONFIG_FW = "/etc/sysconfig/SuSEfirewall2"
SYSCONFIG_FW_CLUSTER = "/etc/sysconfig/SuSEfirewall2.d/services/cluster"
+PCMK_REMOTE_AUTH = "/etc/pacemaker/authkey"
+
INIT_STAGES = ("ssh", "ssh_remote", "csync2", "csync2_remote", "corosync",
"storage", "sbd", "cluster", "vgfs", "admin")
@@ -684,6 +686,7 @@
include /etc/samba/smb.conf;
include /etc/sysconfig/pacemaker;
include /etc/sysconfig/sbd;
+include /etc/pacemaker/authkey;
}
""" % (utils.this_node()), CSYNC2_CFG)
@@ -745,6 +748,26 @@
invoke("corosync-keygen -l")
+def init_remote_auth():
+"""
+Generate the pacemaker-remote authkey
+"""
+if os.path.exists(PCMK_REMOTE_AUTH):
+if not confirm("%s already exists - overwrite?" % (PCMK_REMOTE_AUTH)):
+return
+try:
+os.remove(PCMK_REMOTE_AUTH)
+except os.error:
+error("Failed to remove %s" % (PCMK_REMOTE_AUTH))
+
+pcmk_remote_dir = os.path.dirname(PCMK_REMOTE_AUTH)
+if not os.path.exists(pcmk_remote_dir):
+invoke("mkdir -p --mode=0750 {}".format(pcmk_remote_dir))
+invoke("chgrp haclient {}".format(pcmk_remote_dir))
+
+invoke("dd if=/dev/urandom of={} bs=4096 count=1".format(PCMK_REMOTE_AUTH))
+
+
def valid_network(addr, prev_value=None):
"""
bindnetaddr(IPv4) must be one of the local networks
@@ -1282,11 +1305,6 @@
specify here will be destroyed.
""")
-configured_dev = configured_sbd_device()
-if configured_dev:
-if not confirm("SBD is already configured to use %s - overwrite?"
% (configured_dev)):
-return
-
if not confirm("Do you wish to use SBD?"):
warn("Not configuring SBD - STONITH will be disabled.")
# Comment out SBD devices if present
@@ -1303,6 +1321,11 @@
if utils.is_program("sbd") is None:
error("sbd executable not found! Cannot configure SBD.")
+configured_dev = configured_sbd_device()
+if configured_dev:
+if not confirm("SBD is already configured to use %s - overwrite?"
% (configured_dev)):
+return
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2018-02-09 15:48:01
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Fri Feb 9 15:48:01 2018 rev:140 rq:574058 version:4.0.0+git.1518073467.76fb6a0b
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2018-02-07
18:42:51.896104819 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2018-02-09
15:48:02.158335569 +0100
@@ -1,0 +2,6 @@
+Thu Feb 08 07:05:28 UTC 2018 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1518073467.76fb6a0b:
+ * high: crm_script: Python2->3 string conversion crash in wizards
(bsc#1074835)
+
+---
Old:
crmsh-4.0.0+git.1518010150.a58fa637.tar.bz2
New:
crmsh-4.0.0+git.1518073467.76fb6a0b.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.ODpf6s/_old 2018-02-09 15:48:02.970306410 +0100
+++ /var/tmp/diff_new_pack.ODpf6s/_new 2018-02-09 15:48:02.974306266 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:4.0.0+git.1518010150.a58fa637
+Version:4.0.0+git.1518073467.76fb6a0b
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.ODpf6s/_old 2018-02-09 15:48:03.010304973 +0100
+++ /var/tmp/diff_new_pack.ODpf6s/_new 2018-02-09 15:48:03.010304973 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- a58fa637efb583995c31c62d3fa3894b875e2f3a
\ No newline at end of file
+ 76fb6a0be7c121e971907d98af7e4b3bbc6f9548
\ No newline at end of file
++ crmsh-4.0.0+git.1518010150.a58fa637.tar.bz2 ->
crmsh-4.0.0+git.1518073467.76fb6a0b.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1518010150.a58fa637/utils/crm_script.py
new/crmsh-4.0.0+git.1518073467.76fb6a0b/utils/crm_script.py
--- old/crmsh-4.0.0+git.1518010150.a58fa637/utils/crm_script.py 2018-02-07
14:29:10.0 +0100
+++ new/crmsh-4.0.0+git.1518073467.76fb6a0b/utils/crm_script.py 2018-02-08
08:04:27.0 +0100
@@ -22,6 +22,16 @@
break
+def decode_utf8(s):
+"""
+Convert the given byte sequence to a
+utf8 string.
+"""
+if s is None or isinstance(s, str):
+return s
+return s.decode('utf-8', 'ignore')
+
+
def host():
return os.uname()[1]
@@ -96,7 +106,7 @@
debug("crm_script(call): %s" % (cmd))
p = proc.Popen(cmd, shell=shell, stdin=None, stdout=proc.PIPE,
stderr=proc.PIPE)
out, err = p.communicate()
-return p.returncode, out.decode('utf-8').strip(),
err.decode('utf-8').strip()
+return p.returncode, decode_utf8(out).strip(), decode_utf8(err).strip()
def use_sudo():
@@ -131,7 +141,7 @@
rc, out, err = sudo_call(['./crm_pkg.py', '-n', name, '-s', state])
if rc != 0:
raise IOError("%s / %s" % (out, err))
-outp = json.loads(out.decode('utf-8'))
+outp = json.loads(decode_utf8(out))
if isinstance(outp, dict) and 'rc' in outp:
rc = int(outp['rc'])
if rc != 0:
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2018-02-07 18:42:49
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Wed Feb 7 18:42:49 2018 rev:139 rq:573719 version:4.0.0+git.1518010150.a58fa637
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2018-01-17
21:59:32.643746783 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2018-02-07
18:42:51.896104819 +0100
@@ -1,0 +2,9 @@
+Wed Feb 07 13:50:36 UTC 2018 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1518010150.a58fa637:
+ * high: bootstrap: Add QDevice/QNetd support (bsc#1070961)
+ * medium: hb_report: implement dlm_dump info (bsc#1078710)
+ * fix: hb_report: collect sbd info (bsc#1076389)
+ * fix: hb_report: Collect irregular log file (bsc#1067438)
+
+---
Old:
crmsh-4.0.0+git.1516124911.d66d9d1f.tar.bz2
New:
crmsh-4.0.0+git.1518010150.a58fa637.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.RsVGT5/_old 2018-02-07 18:42:52.700067176 +0100
+++ /var/tmp/diff_new_pack.RsVGT5/_new 2018-02-07 18:42:52.700067176 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:4.0.0+git.1516124911.d66d9d1f
+Version:4.0.0+git.1518010150.a58fa637
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.RsVGT5/_old 2018-02-07 18:42:52.748064928 +0100
+++ /var/tmp/diff_new_pack.RsVGT5/_new 2018-02-07 18:42:52.748064928 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- d66d9d1fcee2cb4f0f4b06beaa4f5140caeb67e3
\ No newline at end of file
+ a58fa637efb583995c31c62d3fa3894b875e2f3a
\ No newline at end of file
++ crmsh-4.0.0+git.1516124911.d66d9d1f.tar.bz2 ->
crmsh-4.0.0+git.1518010150.a58fa637.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.0.0+git.1516124911.d66d9d1f/.travis.yml
new/crmsh-4.0.0+git.1518010150.a58fa637/.travis.yml
--- old/crmsh-4.0.0+git.1516124911.d66d9d1f/.travis.yml 2018-01-16
18:48:31.0 +0100
+++ new/crmsh-4.0.0+git.1518010150.a58fa637/.travis.yml 2018-02-07
14:29:10.0 +0100
@@ -8,7 +8,7 @@
- docker pull krig/crmsh:latest
script:
- - docker run -t -v "$(pwd):/app" krig/crmsh /bin/sh -c "systemctl start
dbus; cd /app; ./test/run-in-container.sh"
+ - docker run -t -v "$(pwd):/app" krig/crmsh /bin/sh -c "systemctl start
dbus; cd /app; ./test/run-in-travis.sh"
after_failure:
- sudo cat $TRAVIS_BUILD_DIR/crmtestout/regression.out
$TRAVIS_BUILD_DIR/crmtestout/crm.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1516124911.d66d9d1f/crmsh/bootstrap.py
new/crmsh-4.0.0+git.1518010150.a58fa637/crmsh/bootstrap.py
--- old/crmsh-4.0.0+git.1516124911.d66d9d1f/crmsh/bootstrap.py 2018-01-16
18:48:31.0 +0100
+++ new/crmsh-4.0.0+git.1518010150.a58fa637/crmsh/bootstrap.py 2018-02-07
14:29:10.0 +0100
@@ -66,6 +66,7 @@
self.connect_name = None
self.second_hb = None
self.ui_context = None
+self.qdevice = None
_context = None
@@ -549,12 +550,16 @@
Please note corosync uses two UDP ports mcastport (for mcast
receives) and mcastport - 1 (for mcast sends).
+
+Also open QNetd/QDevice port if configured.
"""
# all mcastports defined in corosync config
udp = corosync.get_values("totem.interface.mcastport")
udp.extend([str(int(p) - 1) for p in udp])
-configure_firewall(udp=udp)
+tcp = corosync.get_values("totem.quorum.device.net.port")
+
+configure_firewall(tcp=tcp, udp=udp)
def init_cluster_local():
@@ -912,7 +917,8 @@
mcastport=mcastport_res,
transport="udpu",
ipv6=_context.ipv6,
-two_rings=two_rings)
+two_rings=two_rings,
+qdevice=_context.qdevice)
csync2_update(corosync.conf())
@@ -1032,7 +1038,8 @@
mcastport=mcastport_res,
ipv6=_context.ipv6,
nodeid=nodeid,
-two_rings=two_rings)
+two_rings=two_rings,
+qdevice=_context.qdevice)
csync2_update(corosync.conf())
@@ -1723,6 +1730,9 @@
# get a list of nodes, excluding remote nodes
nodelist = None
loop_count = 0
+device_votes = 0
+nodecount = 0
+expected_votes = 0
while True:
rc,
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2018-01-17 21:58:24
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Wed Jan 17 21:58:24 2018 rev:138 rq:566488 version:4.0.0+git.1516124911.d66d9d1f
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2018-01-13
21:49:07.645934986 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2018-01-17
21:59:32.643746783 +0100
@@ -1,0 +2,7 @@
+Tue Jan 16 17:50:14 UTC 2018 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1516124911.d66d9d1f:
+ * medium: constants: Add bundle to constants (bsc#1076239)
+ * low: xmlutil: Add bundle to sort (bsc#1076239)
+
+---
Old:
crmsh-4.0.0+git.1515767348.9561209c.tar.bz2
New:
crmsh-4.0.0+git.1516124911.d66d9d1f.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.uX9dvW/_old 2018-01-17 21:59:33.247718474 +0100
+++ /var/tmp/diff_new_pack.uX9dvW/_new 2018-01-17 21:59:33.251718286 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:4.0.0+git.1515767348.9561209c
+Version:4.0.0+git.1516124911.d66d9d1f
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.uX9dvW/_old 2018-01-17 21:59:33.299716036 +0100
+++ /var/tmp/diff_new_pack.uX9dvW/_new 2018-01-17 21:59:33.299716036 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 9561209c80e799683eda21e4fc93c9740db8e42e
\ No newline at end of file
+ d66d9d1fcee2cb4f0f4b06beaa4f5140caeb67e3
\ No newline at end of file
++ crmsh-4.0.0+git.1515767348.9561209c.tar.bz2 ->
crmsh-4.0.0+git.1516124911.d66d9d1f.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1515767348.9561209c/crmsh/constants.py
new/crmsh-4.0.0+git.1516124911.d66d9d1f/crmsh/constants.py
--- old/crmsh-4.0.0+git.1515767348.9561209c/crmsh/constants.py 2018-01-12
15:29:08.0 +0100
+++ new/crmsh-4.0.0+git.1516124911.d66d9d1f/crmsh/constants.py 2018-01-16
18:48:31.0 +0100
@@ -100,7 +100,7 @@
"tag": "tag",
"alert": "alert",
}
-container_tags = ("group", "clone", "ms", "master")
+container_tags = ("group", "clone", "ms", "master", "bundle")
clonems_tags = ("clone", "ms", "master")
resource_tags = ("primitive", "group", "clone", "ms", "master", "template")
constraint_tags = ("rsc_location", "rsc_colocation", "rsc_order", "rsc_ticket")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.0.0+git.1515767348.9561209c/crmsh/xmlutil.py
new/crmsh-4.0.0+git.1516124911.d66d9d1f/crmsh/xmlutil.py
--- old/crmsh-4.0.0+git.1515767348.9561209c/crmsh/xmlutil.py2018-01-12
15:29:08.0 +0100
+++ new/crmsh-4.0.0+git.1516124911.d66d9d1f/crmsh/xmlutil.py2018-01-16
18:48:31.0 +0100
@@ -832,7 +832,7 @@
_sort_xml_order = make_sort_map('node',
-'template', 'primitive', 'group', 'master',
'clone', 'op',
+'template', 'primitive', 'bundle', 'group',
'master', 'clone', 'op',
'tag',
['rsc_location', 'rsc_colocation',
'rsc_order'],
['rsc_ticket', 'fencing-topology'],
@@ -841,7 +841,7 @@
'alert')
_sort_cli_order = make_sort_map('node',
-'rsc_template', 'primitive', 'group',
+'rsc_template', 'primitive', 'bundle', 'group',
['ms', 'master'], 'clone', 'op',
'tag',
['location', 'colocation', 'collocation',
'order'],
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2018-01-13 21:49:03
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Sat Jan 13 21:49:03 2018 rev:137 rq:563866 version:4.0.0+git.1515767348.9561209c
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2018-01-10
23:36:06.349383198 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2018-01-13
21:49:07.645934986 +0100
@@ -1,0 +2,13 @@
+Fri Jan 12 14:30:15 UTC 2018 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1515767348.9561209c:
+ * medium: ui_cluster: Stop corosync when stopping pacemaker (bsc#1066156)
+ * medium: bootstrap: Don't try to remove full nodes from remote nodes
+ * medium: clvm-vg: update to use LVM-activate RA (bsc#1074835)
+ * medium: clvm: update to use lvmlockd instead of clvmd (bsc#1074835)
+ * low: ui_node: normal is deprecated in favor of member (fate#324508)
+ * low: ui_configure: no complete for rename new_id
+ * low: bootstrap: Don't ssh to localhost in remove
+ * low: ui_configure: improve do_group completer
+
+---
Old:
crmsh-4.0.0+git.1515511613.5ee0eb23.tar.bz2
New:
crmsh-4.0.0+git.1515767348.9561209c.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.he92MD/_old 2018-01-13 21:49:08.333902910 +0100
+++ /var/tmp/diff_new_pack.he92MD/_new 2018-01-13 21:49:08.337902724 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:4.0.0+git.1515511613.5ee0eb23
+Version:4.0.0+git.1515767348.9561209c
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.he92MD/_old 2018-01-13 21:49:08.389900299 +0100
+++ /var/tmp/diff_new_pack.he92MD/_new 2018-01-13 21:49:08.389900299 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 5ee0eb231d19e543bcba9a5dd9f43327096ff1b3
\ No newline at end of file
+ 9561209c80e799683eda21e4fc93c9740db8e42e
\ No newline at end of file
++ crmsh-4.0.0+git.1515511613.5ee0eb23.tar.bz2 ->
crmsh-4.0.0+git.1515767348.9561209c.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1515511613.5ee0eb23/crmsh/bootstrap.py
new/crmsh-4.0.0+git.1515767348.9561209c/crmsh/bootstrap.py
--- old/crmsh-4.0.0+git.1515511613.5ee0eb23/crmsh/bootstrap.py 2018-01-09
16:26:53.0 +0100
+++ new/crmsh-4.0.0+git.1515767348.9561209c/crmsh/bootstrap.py 2018-01-12
15:29:08.0 +0100
@@ -1804,6 +1804,13 @@
"""
_context.connect_name = seed_host
_context.host_status = 0
+
+# if node is localhost, assume connected and hostname = cluster name
+if seed_host == utils.this_node():
+_context.cluster_node = seed_host
+_context.host_status = 1
+return
+
_rc, outp, _errp = utils.get_stdout_stderr("ssh root@{}
\"hostname\"".format(seed_host))
if outp:
_context.connect_name = seed_host
@@ -2095,7 +2102,7 @@
error("Removing self requires --force")
# get list of cluster nodes
me = utils.this_node()
-nodes = xmlutil.listnodes()
+nodes = xmlutil.listnodes(include_remote_nodes=False)
othernode = next((x for x in nodes if x != me), None)
if othernode is not None:
# remove from other node
@@ -2106,7 +2113,7 @@
else:
# stop cluster
if not stop_service("corosync"):
-error("Stopping corosync on failed")
+error("Stopping corosync failed")
# remove all trace of cluster from this node
# delete configuration files from the node to be removed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1515511613.5ee0eb23/crmsh/cibconfig.py
new/crmsh-4.0.0+git.1515767348.9561209c/crmsh/cibconfig.py
--- old/crmsh-4.0.0+git.1515511613.5ee0eb23/crmsh/cibconfig.py 2018-01-09
16:26:53.0 +0100
+++ new/crmsh-4.0.0+git.1515767348.9561209c/crmsh/cibconfig.py 2018-01-12
15:29:08.0 +0100
@@ -2187,13 +2187,6 @@
t = cib_factory.get_op_default("timeout")
if t is not None:
return t
-t = cib_factory.get_property("default-action-timeout")
-if t is not None:
-return t
-try:
-return get_pe_meta().param_default("default-action-timeout")
-except:
-return 0
#
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2018-01-10 23:36:04
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Wed Jan 10 23:36:04 2018 rev:136 rq:563058 version:4.0.0+git.1515511613.5ee0eb23
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-12-14
11:03:29.958189541 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2018-01-10
23:36:06.349383198 +0100
@@ -1,0 +2,10 @@
+Tue Jan 09 15:31:11 UTC 2018 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1515511613.5ee0eb23:
+ * high: scripts: Enable complex expressions in when: (bsc#1074835)
+ * medium: hb_report: Support new pacemaker.log location (fate#324508)
+ * low: ui_configure: Complete rsc template correctly
+ * fix: ra: Convert bytes to str
+ * fix: ui_resource: Using crm_failcount instead of crm_attribute(bsc#1074127)
+
+---
Old:
crmsh-4.0.0+git.1513179435.e1d17d7b.tar.bz2
New:
crmsh-4.0.0+git.1515511613.5ee0eb23.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.hIQEt8/_old 2018-01-10 23:36:06.909356924 +0100
+++ /var/tmp/diff_new_pack.hIQEt8/_new 2018-01-10 23:36:06.913356736 +0100
@@ -1,7 +1,7 @@
#
# spec file for package crmsh
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:4.0.0+git.1513179435.e1d17d7b
+Version:4.0.0+git.1515511613.5ee0eb23
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.hIQEt8/_old 2018-01-10 23:36:06.949355047 +0100
+++ /var/tmp/diff_new_pack.hIQEt8/_new 2018-01-10 23:36:06.953354859 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- e1d17d7b1a3b6b4a3ca0211d72d8102b150c0c65
\ No newline at end of file
+ 5ee0eb231d19e543bcba9a5dd9f43327096ff1b3
\ No newline at end of file
++ crmsh-4.0.0+git.1513179435.e1d17d7b.tar.bz2 ->
crmsh-4.0.0+git.1515511613.5ee0eb23.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.0.0+git.1513179435.e1d17d7b/crmsh/config.py
new/crmsh-4.0.0+git.1515511613.5ee0eb23/crmsh/config.py
--- old/crmsh-4.0.0+git.1513179435.e1d17d7b/crmsh/config.py 2017-12-13
16:37:15.0 +0100
+++ new/crmsh-4.0.0+git.1515511613.5ee0eb23/crmsh/config.py 2018-01-09
16:26:53.0 +0100
@@ -260,7 +260,7 @@
'from_time': opt_string('-12H'),
'compress': opt_boolean('yes'),
'speed_up': opt_boolean('no'),
-'collect_extra_logs': opt_string('/var/log/messages
/var/log/pacemaker.log /var/log/ha-cluster-bootstrap.log'),
+'collect_extra_logs': opt_string('/var/log/messages
/var/log/pacemaker/pacemaker.log /var/log/pacemaker.log
/var/log/ha-cluster-bootstrap.log'),
'remove_exist_dest': opt_boolean('no'),
'single_node': opt_boolean('no')
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1513179435.e1d17d7b/crmsh/minieval.py
new/crmsh-4.0.0+git.1515511613.5ee0eb23/crmsh/minieval.py
--- old/crmsh-4.0.0+git.1513179435.e1d17d7b/crmsh/minieval.py 1970-01-01
01:00:00.0 +0100
+++ new/crmsh-4.0.0+git.1515511613.5ee0eb23/crmsh/minieval.py 2018-01-09
16:26:53.0 +0100
@@ -0,0 +1,360 @@
+# Copyright (C) 2013-2017 Daniel Fairhead
+# Copyright (C) 2017 Kristoffer Gronlund
+# See COPYING for license information.
+
+"""
+Based on simpleeval:
+
+SimpleEval - (C) 2013-2017 Daniel Fairhead
+-
+
+An short, easy to use, safe and reasonably extensible expression evaluator.
+Designed for things like in a website where you want to allow the user to
+generate a string, or a number from some other input, without allowing full
+eval() or other unsafe or needlessly complex linguistics.
+
+-
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish,
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2017-12-14 11:03:28
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Thu Dec 14 11:03:28 2017 rev:135 rq:556723 version:4.0.0+git.1513179435.e1d17d7b
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-12-06
08:58:47.340546096 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-12-14
11:03:29.958189541 +0100
@@ -1,0 +2,15 @@
+Wed Dec 13 16:15:40 UTC 2017 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1513179435.e1d17d7b:
+ * high: scripts: Fix Python 3 migration issues in health, check-uptime
(bsc#1071519)
+
+---
+Tue Dec 12 15:44:48 UTC 2017 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1513011384.5aebf8a4:
+ * high: parse: Support new alert syntax (#280) (bsc#1069129)
+ * high: parse: Support new container bundles (fate#323415)
+ * low: hb_report: return "" to avoid TypeError
+ * low: ui_configure: use filter_keys replace any_startswith
+
+---
Old:
crmsh-4.0.0+git.1512406036.adc26906.tar.bz2
New:
crmsh-4.0.0+git.1513179435.e1d17d7b.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.LGgdfp/_old 2017-12-14 11:03:30.970140690 +0100
+++ /var/tmp/diff_new_pack.LGgdfp/_new 2017-12-14 11:03:30.970140690 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:4.0.0+git.1512406036.adc26906
+Version:4.0.0+git.1513179435.e1d17d7b
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.LGgdfp/_old 2017-12-14 11:03:31.006138952 +0100
+++ /var/tmp/diff_new_pack.LGgdfp/_new 2017-12-14 11:03:31.006138952 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- adc269069314c9a6ad2b0b378745d9161604097a
\ No newline at end of file
+ e1d17d7b1a3b6b4a3ca0211d72d8102b150c0c65
\ No newline at end of file
++ crmsh-4.0.0+git.1512406036.adc26906.tar.bz2 ->
crmsh-4.0.0+git.1513179435.e1d17d7b.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1512406036.adc26906/crmsh/cibconfig.py
new/crmsh-4.0.0+git.1513179435.e1d17d7b/crmsh/cibconfig.py
--- old/crmsh-4.0.0+git.1512406036.adc26906/crmsh/cibconfig.py 2017-12-04
17:47:16.0 +0100
+++ new/crmsh-4.0.0+git.1513179435.e1d17d7b/crmsh/cibconfig.py 2017-12-13
16:37:15.0 +0100
@@ -686,7 +686,7 @@
'alerts': 'alert',
}
-idless = set(['operations', 'fencing-topology'])
+idless = set(['operations', 'fencing-topology', 'network', 'docker',
'rkt', 'storage'])
isref = set(['resource_ref', 'obj_ref', 'crmsh-ref'])
def needs_id(node):
@@ -966,6 +966,17 @@
elif idref is not None:
ret += "%s " % (nvpair_format("$id-ref", idref))
+if node.tag in ["docker", "network"]:
+for item in node.keys():
+ret += "%s " % nvpair_format(item, node.get(item))
+if node.tag == "primitive":
+ret += node.get('id')
+for _type in ["port-mapping", "storage-mapping"]:
+for c in node.iterchildren(_type):
+ret += "%s " % _type
+for item in c.keys():
+ret += "%s " % nvpair_format(item, c.get(item))
+
score = node.get("score")
if score:
ret += "%s: " % (clidisplay.score(score))
@@ -1630,6 +1641,29 @@
child_rsc.repr_gv(sg_obj, from_grp=True)
+class CibBundle(CibObject):
+'''
+bundle type resource
+'''
+set_names = {
+"instance_attributes": "params",
+"meta_attributes": "meta",
+"docker": "docker",
+"network": "network",
+"storage": "storage",
+"primitive": "primitive",
+"meta": "meta"
+}
+
+def _repr_cli_head(self, format_mode):
+s = clidisplay.keyword(self.obj_type)
+ident = clidisplay.ident(self.obj_id)
+return "%s %s" % (s, ident)
+
+def _repr_cli_child(self, c, format_mode):
+return self._attr_set_str(c)
+
+
def _check_if_constraint_ref_is_child(obj):
"""
Used by check_sanity for constraints to verify
@@ -2104,6 +2138,17 @@
def _repr_cli_child(self, c, format_mode):
if c.tag in self.set_names:
return self._attr_set_str(c)
+elif
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2017-12-06 08:58:44
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Wed Dec 6 08:58:44 2017 rev:134 rq:548185 version:4.0.0+git.1512406036.adc26906
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-11-27
22:19:08.717035955 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-12-06
08:58:47.340546096 +0100
@@ -1,0 +2,22 @@
+Mon Dec 04 16:48:34 UTC 2017 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1512406036.adc26906:
+ * high: bootstrap: Fix firewall reload command invocation (bsc#1071108)
+
+---
+Mon Dec 04 13:50:40 UTC 2017 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1512395407.e65870b4:
+ * high: bootstrap: Encode, not decode (bsc#1070344)
+
+---
+Mon Dec 04 11:04:01 UTC 2017 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1512385350.d06aa847:
+ * Fix writing non-ascii chars to log (bsc#1070344)
+ * Fix is_program(dmidecode) error (bsc#1070344)
+ * low: ui_configure: fix for 309d2e, remove "id=" in a save way
+ * low: ra: Don't require deprecated parameters (#321)
+ * low: cibconfig: use refresh instead of reset after commit
+
+---
Old:
crmsh-4.0.0+git.1511604050.816cb0f5.tar.bz2
New:
crmsh-4.0.0+git.1512406036.adc26906.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.AI232f/_old 2017-12-06 08:58:47.900525598 +0100
+++ /var/tmp/diff_new_pack.AI232f/_new 2017-12-06 08:58:47.900525598 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:4.0.0+git.1511604050.816cb0f5
+Version:4.0.0+git.1512406036.adc26906
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.AI232f/_old 2017-12-06 08:58:47.936524281 +0100
+++ /var/tmp/diff_new_pack.AI232f/_new 2017-12-06 08:58:47.940524134 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 816cb0f524860f165fc38cb95c92b10c26e6bba4
\ No newline at end of file
+ adc269069314c9a6ad2b0b378745d9161604097a
\ No newline at end of file
++ crmsh-4.0.0+git.1511604050.816cb0f5.tar.bz2 ->
crmsh-4.0.0+git.1512406036.adc26906.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1511604050.816cb0f5/crmsh/bootstrap.py
new/crmsh-4.0.0+git.1512406036.adc26906/crmsh/bootstrap.py
--- old/crmsh-4.0.0+git.1511604050.816cb0f5/crmsh/bootstrap.py 2017-11-25
11:00:50.0 +0100
+++ new/crmsh-4.0.0+git.1512406036.adc26906/crmsh/bootstrap.py 2017-12-04
17:47:16.0 +0100
@@ -109,8 +109,9 @@
def log(*args):
global LOG_FILE
try:
-with open(LOG_FILE, "a") as logfile:
-logfile.write(" ".join([str(arg) for arg in args]) + "\n")
+with open(LOG_FILE, "ab") as logfile:
+text = " ".join([utils.to_ascii(arg) for arg in args]) + "\n"
+logfile.write(text.encode('ascii', 'backslashreplace'))
except IOError:
if LOG_FILE != log_file_fallback():
LOG_FILE = log_file_fallback()
@@ -509,7 +510,8 @@
cmd("--add-port={}/udp".format(p))
if has_firewalld:
-cmd("--reload")
+if not invoke("firewall-cmd --reload"):
+error("Failed to reload firewall configuration.")
def init_firewall_ufw(tcp, udp):
"""
@@ -1040,7 +1042,7 @@
"""
@utils.memoize
def check_amazon():
-if not is_program("dmidecode"):
+if not utils.is_program("dmidecode"):
return False
_rc, outp = utils.get_stdout("dmidecode -s system-version")
return re.search(r"\<.*\.amazon\>", outp) is not None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1511604050.816cb0f5/crmsh/cibconfig.py
new/crmsh-4.0.0+git.1512406036.adc26906/crmsh/cibconfig.py
--- old/crmsh-4.0.0+git.1511604050.816cb0f5/crmsh/cibconfig.py 2017-11-25
11:00:50.0 +0100
+++ new/crmsh-4.0.0+git.1512406036.adc26906/crmsh/cibconfig.py 2017-12-04
17:47:16.0 +0100
@@ -2567,7 +2567,7 @@
common_debug("CIB commit successful at %s" % (t))
if is_live_cib():
self.last_commit_time = t
-
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2017-11-27 22:19:07
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Mon Nov 27 22:19:07 2017 rev:133 rq:546044 version:4.0.0+git.1511604050.816cb0f5
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-11-13
14:07:55.349858835 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-11-27
22:19:08.717035955 +0100
@@ -1,0 +2,21 @@
+Mon Nov 27 15:06:41 UTC 2017 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1511604050.816cb0f5:
+ * high: crm_rpmcheck: Fix bytes to str encoding error (bsc#1069294)
+ * medium: bootstrap: Missing dmidecode on ppc64le (bsc#1069802)
+
+---
+Tue Nov 21 09:51:15 UTC 2017 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1511256861.18b44cfa:
+ * high: bootstrap: Use default IP address for ring0 (bsc#1069142)
+ * medium: scripts: make sure gfs2 can be configured using hawk (bsc#1067123)
+ * medium: bootstrap: fix init vgfs crash if no "-o device" option
+ * medium: bootstrap: fix init storage crash if no value input
+ * medium: ui_configure: fix crash when no args given
+ * medium: filter exist args
+ * low: utils: convert bytes to str (bsc#1067823)
+ * low: ui_context: Continue completing when input is an alias
+ * low: bootstrap: Change error/confirm message with specific device name
+
+---
@@ -17 +38 @@
- * low: bootstrap: Avoid printing None instead of NTP service name
+ * low: bootstrap: Avoid printing None instead of NTP service name
(bsc#1060602)
Old:
crmsh-4.0.0+git.1510563824.1aecfa01.tar.bz2
New:
crmsh-4.0.0+git.1511604050.816cb0f5.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.wgdQgB/_old 2017-11-27 22:19:09.365012437 +0100
+++ /var/tmp/diff_new_pack.wgdQgB/_new 2017-11-27 22:19:09.365012437 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:4.0.0+git.1510563824.1aecfa01
+Version:4.0.0+git.1511604050.816cb0f5
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.wgdQgB/_old 2017-11-27 22:19:09.413010696 +0100
+++ /var/tmp/diff_new_pack.wgdQgB/_new 2017-11-27 22:19:09.417010551 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 1aecfa01858a5a8edc303d9897a651eeaec23d80
\ No newline at end of file
+ 816cb0f524860f165fc38cb95c92b10c26e6bba4
\ No newline at end of file
++ crmsh-4.0.0+git.1510563824.1aecfa01.tar.bz2 ->
crmsh-4.0.0+git.1511604050.816cb0f5.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1510563824.1aecfa01/crmsh/bootstrap.py
new/crmsh-4.0.0+git.1511604050.816cb0f5/crmsh/bootstrap.py
--- old/crmsh-4.0.0+git.1510563824.1aecfa01/crmsh/bootstrap.py 2017-11-13
10:03:44.0 +0100
+++ new/crmsh-4.0.0+git.1511604050.816cb0f5/crmsh/bootstrap.py 2017-11-25
11:00:50.0 +0100
@@ -138,7 +138,7 @@
drop_last_history()
if match is None:
return val
-if re.match(match, val) is not None:
+if val and re.match(match, val) is not None:
if not valid_func or valid_func(val, prev_value):
return val
print(term.render(clidisplay.error("Invalid value entered")))
@@ -881,7 +881,7 @@
for i in 0, 1:
ringXaddr = prompt_for_string('Address for ring{}'.format(i),
r'([0-9]+\.){3}[0-9]+|[0-9a-fA-F]{1,4}:',
- "",
+ _context.ip_address if i == 0 and
_context.ip_address else "",
valid_ucastIP,
ringXaddr_res)
if not ringXaddr:
@@ -1040,6 +1040,8 @@
"""
@utils.memoize
def check_amazon():
+if not is_program("dmidecode"):
+return False
_rc, outp = utils.get_stdout("dmidecode -s system-version")
return re.search(r"\<.*\.amazon\>", outp) is not None
@@ -1368,10 +1370,12 @@
Configure cluster OCFS2 device.
"""
dev = _context.ocfs2_device
+if not dev:
+error("vgfs stage requires -o ")
mntpoint = "/srv/clusterfs"
if not is_block_device(dev):
-error("OCFS2 device $OCFS2_DEVICE does not exist")
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2017-11-13 14:07:28
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Mon Nov 13 14:07:28 2017 rev:132 rq:541206 version:4.0.0+git.1510563824.1aecfa01
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-11-10
14:58:03.854630965 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-11-13
14:07:55.349858835 +0100
@@ -1,0 +2,10 @@
+Mon Nov 13 09:04:41 UTC 2017 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1510563824.1aecfa01:
+ * high: utils: Use python3 in util scripts (bsc#1067823)
+ * high: bootstrap: Use firewall-offline-cmd for firewalld (bsc#1067498)
+ * medium: hb_report: Verify corosync.conf exists before opening it
(bsc#1067456)
+ * low: config: Collect /var/log/ha-cluster-bootstrap.log (bsc#1067438)
+ * medium: bootstrap: Avoid SSH to localhost (bsc#1067324)
+
+---
Old:
crmsh-4.0.0+git.1510233955.43c72bf7.tar.bz2
New:
crmsh-4.0.0+git.1510563824.1aecfa01.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.2e6zUC/_old 2017-11-13 14:07:56.365822282 +0100
+++ /var/tmp/diff_new_pack.2e6zUC/_new 2017-11-13 14:07:56.369822138 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:4.0.0+git.1510233955.43c72bf7
+Version:4.0.0+git.1510563824.1aecfa01
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.2e6zUC/_old 2017-11-13 14:07:56.405820843 +0100
+++ /var/tmp/diff_new_pack.2e6zUC/_new 2017-11-13 14:07:56.405820843 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 43c72bf7f33b941ba68e41d612741591e0d7fa92
\ No newline at end of file
+ 1aecfa01858a5a8edc303d9897a651eeaec23d80
\ No newline at end of file
++ crmsh-4.0.0+git.1510233955.43c72bf7.tar.bz2 ->
crmsh-4.0.0+git.1510563824.1aecfa01.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1510233955.43c72bf7/crmsh/bootstrap.py
new/crmsh-4.0.0+git.1510563824.1aecfa01/crmsh/bootstrap.py
--- old/crmsh-4.0.0+git.1510233955.43c72bf7/crmsh/bootstrap.py 2017-11-09
14:25:55.0 +0100
+++ new/crmsh-4.0.0+git.1510563824.1aecfa01/crmsh/bootstrap.py 2017-11-13
10:03:44.0 +0100
@@ -495,22 +495,21 @@
error("Failed to restart firewall (SuSEfirewall2)")
def init_firewall_firewalld(tcp, udp):
-if not service_is_active("firewalld"):
-warn("Unable to configure firewall: Not active")
-return
+has_firewalld = service_is_active("firewalld")
+cmdbase = 'firewall-cmd --zone=public --permanent ' if has_firewalld
else 'firewall-offline-cmd --zone=public '
+
+def cmd(args):
+if not invoke(cmdbase + args):
+error("Failed to configure firewall.")
+
for p in tcp:
-if not invoke("firewall-cmd --zone=public --add-port={}/tcp
--permanent".format(p)):
-error("Failed to configure firewall (firewalld via
firewall-cmd)")
+cmd("--add-port={}/tcp".format(p))
for p in udp:
-if not invoke("firewall-cmd --zone=public --add-port={}/udp
--permanent".format(p)):
-error("Failed to configure firewall (firewalld via
firewall-cmd)")
-
-if not service_is_active("firewalld"):
-return
+cmd("--add-port={}/udp".format(p))
-if not invoke("firewall-cmd --reload"):
-warn("Failed to reload firewall configuration (firewalld via
firewall-cmd)")
+if has_firewalld:
+cmd("--reload")
def init_firewall_ufw(tcp, udp):
"""
@@ -1546,9 +1545,13 @@
def join_ssh_merge(_cluster_node):
status("Merging known_hosts")
-hosts = [m.group(1) for m in re.finditer(r"^\s*host\s*([^ ;]+)\s*;",
open(CSYNC2_CFG).read(), re.M)]
+me = utils.this_node()
+hosts = [m.group(1)
+ for m in re.finditer(r"^\s*host\s*([^ ;]+)\s*;",
open(CSYNC2_CFG).read(), re.M)
+ if m.group(1) != me]
if not hosts:
-error("Unable to extract host list from %s" % (CSYNC2_CFG))
+hosts = [_cluster_node]
+warn("Unable to extract host list from %s" % (CSYNC2_CFG))
try:
import parallax
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2017-11-10 14:57:51
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Fri Nov 10 14:57:51 2017 rev:131 rq:540211 version:4.0.0+git.1510233955.43c72bf7
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-11-03
16:29:04.286992413 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-11-10
14:58:03.854630965 +0100
@@ -1,0 +2,8 @@
+Thu Nov 09 13:28:04 UTC 2017 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1510233955.43c72bf7:
+ * high: bootstrap: Fix readline error in cluster remove (bsc#1067424)
+ * low: bootstrap: Clarify removal warning
+ * low: bootstrap: Avoid printing None instead of NTP service name
+
+---
Old:
crmsh-4.0.0+git.1509626995.fa880522.tar.bz2
New:
crmsh-4.0.0+git.1510233955.43c72bf7.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.226NpE/_old 2017-11-10 14:58:04.958591033 +0100
+++ /var/tmp/diff_new_pack.226NpE/_new 2017-11-10 14:58:04.962590889 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:4.0.0+git.1509626995.fa880522
+Version:4.0.0+git.1510233955.43c72bf7
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.226NpE/_old 2017-11-10 14:58:05.022588718 +0100
+++ /var/tmp/diff_new_pack.226NpE/_new 2017-11-10 14:58:05.026588573 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- fa88052261c4fa3d34e1df358fbf9cfdabd33ed9
\ No newline at end of file
+ 43c72bf7f33b941ba68e41d612741591e0d7fa92
\ No newline at end of file
++ crmsh-4.0.0+git.1509626995.fa880522.tar.bz2 ->
crmsh-4.0.0+git.1510233955.43c72bf7.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1509626995.fa880522/crmsh/bootstrap.py
new/crmsh-4.0.0+git.1510233955.43c72bf7/crmsh/bootstrap.py
--- old/crmsh-4.0.0+git.1509626995.fa880522/crmsh/bootstrap.py 2017-11-02
13:49:55.0 +0100
+++ new/crmsh-4.0.0+git.1510233955.43c72bf7/crmsh/bootstrap.py 2017-11-09
14:25:55.0 +0100
@@ -119,6 +119,12 @@
die("Can't append to {} - aborting".format(LOG_FILE))
+def drop_last_history():
+hlen = readline.get_current_history_length()
+if hlen > 0:
+readline.remove_history_item(hlen - 1)
+
+
def prompt_for_string(msg, match=None, default='', valid_func=None,
prev_value=None):
if _context.yes_to_all:
return default
@@ -129,7 +135,7 @@
if not val:
val = default
else:
-
readline.remove_history_item(readline.get_current_history_length()-1)
+drop_last_history()
if match is None:
return val
if re.match(match, val) is not None:
@@ -144,7 +150,7 @@
disable_completion()
rc = utils.ask(msg)
enable_completion()
-readline.remove_history_item(readline.get_current_history_length()-1)
+drop_last_history()
return rc
@@ -378,7 +384,10 @@
timekeeper = tk
break
-if not service_is_enabled(timekeeper):
+if timekeeper is None:
+warn("No NTP service found.")
+warned = True
+elif not service_is_enabled(timekeeper):
warn("{} is not configured to start at system
boot.".format(timekeeper))
warned = True
@@ -2069,7 +2078,7 @@
init()
remove_ssh()
-if not confirm("Do you want to remove node \"{}\"
anyway?".format(cluster_node)):
+if not force and not confirm("Removing node \"{}\" from the cluster: Are
you sure?".format(cluster_node)):
return
if remove_localhost_check():
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1509626995.fa880522/crmsh/ui_cluster.py
new/crmsh-4.0.0+git.1510233955.43c72bf7/crmsh/ui_cluster.py
--- old/crmsh-4.0.0+git.1509626995.fa880522/crmsh/ui_cluster.py 2017-11-02
13:49:55.0 +0100
+++ new/crmsh-4.0.0+git.1510233955.43c72bf7/crmsh/ui_cluster.py 2017-11-09
14:25:55.0 +0100
@@ -394,15 +394,12 @@
return True
@command.skill_level('administrator')
-def do_rename(self, context, *args):
+def do_rename(self, context, new_name):
'''
Rename the cluster.
'''
if not bootstrap.service_is_active("corosync.service"):
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2017-11-03 16:27:48
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Fri Nov 3 16:27:48 2017 rev:130 rq:538350 version:4.0.0+git.1509626995.fa880522
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-09-15
22:32:12.627866153 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-11-03
16:29:04.286992413 +0100
@@ -1,0 +2,28 @@
+Thu Nov 02 12:50:30 UTC 2017 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1509626995.fa880522:
+ * high: bootstrap: revert corosync ports for mcast configuration as well
(bsc#1066196)
+ * high: bootstrap: Revert default corosync port to 5405/5404 (bsc#1066196)
+ * medium: NewCommit: ui_configure: complete for ra actions
+ * medium: ui_configure: Replace compl.null to compl.attr_id where an id is
required
+ * medium: ui_context: Stop completing when an id is required
+ * low: ui_context: reset term when using help command+ctrlC
+ * low: utils: Stop using deprecated functionality
+
+---
+Tue Oct 31 12:11:54 UTC 2017 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1509449399.1e22e954:
+ * Make sure scripts use python3 (fate#323526)
+ * medium: enable add the second heartbeat line for unicast
+ * medium: bootstrap: check init options before running
+ * low: ui_script: Sort keys when printing JSON
+
+---
+Mon Oct 30 07:53:38 UTC 2017 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1509349758.2bd8a099:
+ * Port to Python 3 (fate#323526)
+ * hb_report: config file for hb_report (fate#321640)
+
+---
Old:
crmsh-3.0.1+git.1504985015.b695b452.tar.bz2
New:
crmsh-4.0.0+git.1509626995.fa880522.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.Bo6O1F/_old 2017-11-03 16:29:05.694941167 +0100
+++ /var/tmp/diff_new_pack.Bo6O1F/_new 2017-11-03 16:29:05.698941022 +0100
@@ -32,13 +32,11 @@
%define pkg_group Productivity/Clustering/HA
%endif
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-
Name: crmsh
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:3.0.1+git.1504985015.b695b452
+Version:4.0.0+git.1509626995.fa880522
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
@@ -51,16 +49,16 @@
%endif
Requires: %{name}-scripts >= %{version}-%{release}
Requires: /usr/bin/which
-Requires: python >= 2.6
-Requires: python-lxml
-Requires: python-python-dateutil
+Requires: python3 >= 3.4
+Requires: python3-lxml
+Requires: python3-python-dateutil
%if 0%{?suse_version} > 1320
-Requires: python2-parallax
+Requires: python3-parallax
%else
Requires: python-parallax
%endif
-BuildRequires: python-lxml
-BuildRequires: python-setuptools
+BuildRequires: python3-lxml
+BuildRequires: python3-setuptools
%if 0%{?suse_version}
# only require csync2 on SUSE since bootstrap
@@ -69,11 +67,11 @@
%endif
%if 0%{?suse_version}
-Requires: python-PyYAML
+Requires: python3-PyYAML
# Suse splits this off into a separate package
-Requires: python-curses
+Requires: python3-curses
BuildRequires: fdupes
-BuildRequires: python-curses
+BuildRequires: python3-curses
%endif
%if 0%{?fedora_version}
@@ -85,7 +83,7 @@
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: pkgconfig
-BuildRequires: python
+BuildRequires: python3
%if 0%{?suse_version} > 1210
# xsltproc is necessary for manpage generation; this is split out into
@@ -111,10 +109,10 @@
%if %{with regression_tests}
Requires(post): mailx
Requires(post): procps
-Requires(post): python-python-dateutil
-Requires(post): python-nose
+Requires(post): python3-python-dateutil
+Requires(post): python3-nose
%if 0%{?suse_version} > 1320
-Requires(post): python2-parallax
+Requires(post): python3-parallax
%else
Requires(post): python-parallax
%endif
@@ -130,7 +128,7 @@
%if 0%{?fedora_version}
Requires(post): PyYAML
%else
-Requires(post): python-PyYAML
+Requires(post): python3-PyYAML
%endif
%endif
@@ -155,9 +153,9 @@
touch -r doc/crm.8.adoc{,.timestamp}
# replace the shebang in all the scripts
-# with ${_bindir}/python
-find . -type f -exec perl -pi -e 'BEGIN{undef
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2017-09-15 22:32:11
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Fri Sep 15 22:32:11 2017 rev:129 rq:526345 version:3.0.1+git.1504985015.b695b452
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-09-11
16:23:30.010725703 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-09-15
22:32:12.627866153 +0200
@@ -1,0 +2,5 @@
+Fri Sep 15 10:00:43 UTC 2017 - kgronl...@suse.com
+
+- Correct name of python-dateutil package
+
+---
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.3GNHj6/_old 2017-09-15 22:32:13.519740521 +0200
+++ /var/tmp/diff_new_pack.3GNHj6/_new 2017-09-15 22:32:13.523739958 +0200
@@ -52,8 +52,8 @@
Requires: %{name}-scripts >= %{version}-%{release}
Requires: /usr/bin/which
Requires: python >= 2.6
-Requires: python-dateutil
Requires: python-lxml
+Requires: python-python-dateutil
%if 0%{?suse_version} > 1320
Requires: python2-parallax
%else
@@ -111,7 +111,7 @@
%if %{with regression_tests}
Requires(post): mailx
Requires(post): procps
-Requires(post): python-dateutil
+Requires(post): python-python-dateutil
Requires(post): python-nose
%if 0%{?suse_version} > 1320
Requires(post): python2-parallax
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2017-09-11 16:22:38
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Mon Sep 11 16:22:38 2017 rev:128 rq:522826 version:3.0.1+git.1504985015.b695b452
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-09-04
12:31:02.888008774 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-09-11
16:23:30.010725703 +0200
@@ -1,0 +2,7 @@
+Sat Sep 09 19:24:24 UTC 2017 - kgronl...@suse.com
+
+- Update to version 3.0.1+git.1504985015.b695b452:
+ * medium: ui_node: node attribute/status-attr is about node attr, not for
resources
+ * medium: bootstrap: Only call firewall-cmd if firewalld is active
+
+---
Old:
crmsh-3.0.1+git.1504075678.b5dce7ab.tar.bz2
New:
crmsh-3.0.1+git.1504985015.b695b452.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.2EiCBu/_old 2017-09-11 16:23:30.506656067 +0200
+++ /var/tmp/diff_new_pack.2EiCBu/_new 2017-09-11 16:23:30.510655505 +0200
@@ -38,7 +38,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:3.0.1+git.1504075678.b5dce7ab
+Version:3.0.1+git.1504985015.b695b452
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
@@ -54,7 +54,11 @@
Requires: python >= 2.6
Requires: python-dateutil
Requires: python-lxml
+%if 0%{?suse_version} > 1320
+Requires: python2-parallax
+%else
Requires: python-parallax
+%endif
BuildRequires: python-lxml
BuildRequires: python-setuptools
@@ -109,7 +113,11 @@
Requires(post): procps
Requires(post): python-dateutil
Requires(post): python-nose
+%if 0%{?suse_version} > 1320
Requires(post): python2-parallax
+%else
+Requires(post): python-parallax
+%endif
Requires(post): pacemaker
%if 0%{?suse_version} > 1110
BuildArch: noarch
++ _servicedata ++
--- /var/tmp/diff_new_pack.2EiCBu/_old 2017-09-11 16:23:30.546650451 +0200
+++ /var/tmp/diff_new_pack.2EiCBu/_new 2017-09-11 16:23:30.546650451 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 1885eb21894cb66a375f6d6cc319f59b1653f0f4
\ No newline at end of file
+ b695b452ddaf39acd32311c0f64d8733b5a6348f
\ No newline at end of file
++ crmsh-3.0.1+git.1504075678.b5dce7ab.tar.bz2 ->
crmsh-3.0.1+git.1504985015.b695b452.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-3.0.1+git.1504075678.b5dce7ab/crmsh/bootstrap.py
new/crmsh-3.0.1+git.1504985015.b695b452/crmsh/bootstrap.py
--- old/crmsh-3.0.1+git.1504075678.b5dce7ab/crmsh/bootstrap.py 2017-08-30
08:47:58.0 +0200
+++ new/crmsh-3.0.1+git.1504985015.b695b452/crmsh/bootstrap.py 2017-09-09
21:23:35.0 +0200
@@ -484,6 +484,9 @@
error("Failed to restart firewall (SuSEfirewall2)")
def init_firewall_firewalld(tcp, udp):
+if not service_is_active("firewalld"):
+warn("Unable to configure firewall: Not active")
+return
for p in tcp:
if not invoke("firewall-cmd --zone=public --add-port={}/tcp
--permanent".format(p)):
error("Failed to configure firewall (firewalld via
firewall-cmd)")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-3.0.1+git.1504075678.b5dce7ab/crmsh/ui_node.py
new/crmsh-3.0.1+git.1504985015.b695b452/crmsh/ui_node.py
--- old/crmsh-3.0.1+git.1504075678.b5dce7ab/crmsh/ui_node.py2017-08-30
08:47:58.0 +0200
+++ new/crmsh-3.0.1+git.1504985015.b695b452/crmsh/ui_node.py2017-09-09
21:23:35.0 +0200
@@ -42,17 +42,26 @@
return uname, ident, typ, other, inst_attr, is_offline
-def _find_utilization(args):
+def _find_attr(args):
"""
-complete utilization attrs
+complete utilization/attribute/status-attr attrs
"""
+if not len(args) >= 2:
+return []
cib = xmlutil.cibdump2elem()
if cib is None:
return []
res = []
-node_util = cib.xpath("//nodes/node[@uname='%s']/utilization/nvpair" %
args[-3])
-for item in node_util:
+if args[0] == "utilization":
+ xpath = "//nodes/node[@uname='%s']/utilization/nvpair" % args[1]
+if args[0] == "attribute":
+ xpath = "//nodes/node[@uname='%s']/instance_attributes/nvpair" % args[1]
+if args[0] == "status-attr":
+ xpath = "//status/node_state[@uname='%s']/\
+
commit crmsh for openSUSE:Factory
Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2017-09-04 12:30:59 Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new (New) Package is "crmsh" Mon Sep 4 12:30:59 2017 rev:127 rq:519746 version:3.0.1+git.1504075678.b5dce7ab Changes: --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-08-10 14:13:09.275571019 +0200 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-09-04 12:31:02.888008774 +0200 @@ -1,0 +2,82 @@ +Wed Aug 30 20:12:00 UTC 2017 - kgronl...@suse.com + +- Update to version 3.0.1+git.1504075678.b5dce7ab: + * low: utils: is_process did not work + * low: utils: Use /proc for process discovery + * low: bootstrap: Fix formatting of confirmation prompt (bsc#1028704) + * medium: bootstrap: Set expected_votes based on actual node count (bsc#1033288) + * remove bindnetaddr for unicast(bsc#1030437) + * lsb, service, stonith and systemd don't have any providers; so, it shouldn't be completed when type 'tab' after these ra classes. + * doc: Document lifetime parameter format + * medium: Add support for pacemaker PR#1208 + * Feature: add rules support to operations + * low: bootstrap: Fall back to logging into $TMPDIR/ha-cluster-bootstrap.log + * Improved cd completion + * Improve ls command outputs + * Remove "up/back/end" option at root level + * medium: ui_context: Make all the options can be completed + * medium: ui_ra: Improve resource agents completion + * medium: ui_cluster: Add enable/disable option to enable/disable pacemaker service + * medium:command:adjust the 'ls' print width for long options + * low:scripts:health: save health-report when run "crm cluster health" + * low: ui_cluster: add "delete" alias for "remove" option + * low: bootstrap: give a confirm message when remove node + * medium: bootstrap: add callback function to check valid port range + * medium: ui_cluster: Add cluster rename command + * low: ui_cluster: when use help option, do not exit, just print help messages and return + * low: ui_cluster: when have an error for optparse, just return and stay at shell + * low: ui_cluster: complete node name once + * low: help: adjust the help print width + * low: ui_cluster: show cluster name in cluster status command + * Add missing ')' + * low: completers: filter out ms resource when doing promote/demote + * low: bootstrap: Don't rely on ha-cluster-* shortcuts + * low: bootstrap: Improve message when sbd is not installed (bsc#1050427) + * low: ui_cluster: run command on a specific node + * medium: bootstrap: run "csync2_update" for all files after new joining node call csync2_remote + * low: ui_cluster: change cluster name need restart cluster service + * medium: bootstrap: disable completion and history when running bootstrap + * high: bootstrap: expected votes wouldn't update in unicast mode + * medium: bootstrap: configure with IPv6(mcast) + * medium: bootstrap: configure with IPv6(unicast) + * medium: bootstrap: validation for bindnetaddr/mcastaddr + * medium: bootstrap: validation for admin IP + * medium: utils: list_cluster_nodes: read nodes list from cib.xml + * low: main: add hostname in promptstr + * medium: enable adding a second heartbeat ring for mcast + * low: bootstrap: give error hints when use sbd without watchdog + * medium: ui_resource: start stopped resources and stop started resources + * Detect firewall by checking installed packages + * Fix SBD configuration when using SBD device (Fixes #235) + * medium: bootstrap: Add support for chrony + * low: bootstrap: Check for firewalld before SuSEfirewall2 + * medium: ui_configure: in modgroup, add free id and remove id in group + * medium: ui_node: node utilization is about node attr, not for resources + +- Drop merged patches: + * Remove 0001-Allow-empty-fencing_topology-bsc-1025393.patch + * Remove 0002-low-bootstrap-Fix-warning-for-formatting-SBD-device-.patch + * Remove 0003-medium-ui_cluster-Fix-init-with-no-arguments-bsc-102.patch + * Remove 0004-low-utils-Use-proc-for-process-discovery.patch + * Remove 0005-medium-scripts-health-Make-health-script-available-a.patch + * Remove 0006-remove-bindnetaddr-for-unicast-bsc-1030437.patch + * Remove 0007-medium-bootstrap-Set-expected_votes-based-on-actual-.patch + * Remove 0008-high-cibconfig-Graph-file-output-option-was-reversed.patch + * Remove 0009-medium-bootstrap-Enable-help-geo-init-etc.-bsc-10374.patch + * Remove 0010-medium-bootstrap-Handle-failure-to-fetch-config-grac.patch + * Remove 0011-medium-bootstrap-Check-required-arguments-to-geo-joi.patch + * Remove 0012-doc-geo-join-requires-clusters-argument-bsc-1037442.patch + * Remove 0013-medium-bootstrap-Make-arbitrator-argument-optional-b.patch + * Remove
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2017-08-10 14:05:26
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Thu Aug 10 14:05:26 2017 rev:126 rq:514781 version:3.0.0
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-06-26
15:52:59.997428443 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-08-10
14:13:09.275571019 +0200
@@ -1,0 +2,5 @@
+Fri Aug 4 04:08:05 UTC 2017 - bwiedem...@suse.com
+
+- keep .adoc timestamp to not embed build date in crm.8.html (boo#1047218)
+
+---
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.nxB4zR/_old 2017-08-10 14:13:10.415410529 +0200
+++ /var/tmp/diff_new_pack.nxB4zR/_new 2017-08-10 14:13:10.435407713 +0200
@@ -182,6 +182,7 @@
%prep
%setup -q
+touch -r doc/crm.8.adoc{,.timestamp}
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -209,6 +210,8 @@
# when building on machines in timezones 'behind' the one the
# commit occurred in - which seriously confuses 'make'
find . -mtime -0 -exec touch \{\} \;
+# keep the .adoc mtime because it gets embedded in crm.8.html
+touch -r doc/crm.8.adoc{.timestamp,}
%build
./autogen.sh
commit crmsh for openSUSE:Factory
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?=
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?=
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
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2017-06-23 09:18:26
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Fri Jun 23 09:18:26 2017 rev:124 rq:505664 version:3.0.0
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-06-09
15:56:32.223039733 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-06-23
09:18:50.798350125 +0200
@@ -1,0 +2,8 @@
+Thu Jun 22 11:23:22 UTC 2017 - kgronl...@suse.com
+
+- high: bootstrap: Add option to enable diskless SBD mode to cluster init
(bsc#1045118)
+ * Add 0016-high-bootstrap-Add-option-to-enable-diskless-SBD-mod.patch
+- medium: ui_cluster: Add --force to ha-cluster-remove (bsc#1044071)
+ * Add 0015-medium-ui_cluster-Add-force-to-ha-cluster-remove-bsc.patch
+
+---
New:
0015-medium-ui_cluster-Add-force-to-ha-cluster-remove-bsc.patch
0016-high-bootstrap-Add-option-to-enable-diskless-SBD-mod.patch
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.LeLLme/_old 2017-06-23 09:18:52.146159675 +0200
+++ /var/tmp/diff_new_pack.LeLLme/_new 2017-06-23 09:18:52.150159110 +0200
@@ -70,6 +70,10 @@
Patch13:0013-medium-bootstrap-Make-arbitrator-argument-optional-b.patch
# PATCH-FIX-UPSTREAM: medium: history: Revert preference of messages over
ha-log.txt (bsc#1031138)
Patch14:0014-medium-history-Revert-preference-of-messages-over-ha.patch
+# PATCH-FIX-UPSTREAM: medium: ui_cluster: Add --force to ha-cluster-remove
(bsc#1044071)
+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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
@@ -186,6 +190,8 @@
%patch12 -p1
%patch13 -p1
%patch14 -p1
+%patch15 -p1
+%patch16 -p1
# Force the local time
#
++ 0015-medium-ui_cluster-Add-force-to-ha-cluster-remove-bsc.patch ++
>From a2d241d90164946e0740c791d8d1bb2ef66d22db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?=
Date: Tue, 13 Jun 2017 14:51:56 +0200
Subject: [PATCH 15/16] medium: ui_cluster: Add --force to ha-cluster-remove
(bsc#1044071)
---
crmsh/bootstrap.py | 5 +++--
crmsh/ui_cluster.py | 4 +++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/crmsh/bootstrap.py b/crmsh/bootstrap.py
index 3d648539..2fcd55b6 100644
--- a/crmsh/bootstrap.py
+++ b/crmsh/bootstrap.py
@@ -1551,11 +1551,12 @@ def bootstrap_join(cluster_node=None, nic=None,
quiet=False, yes_to_all=False, w
status("Done (log saved to %s)" % (LOG_FILE))
-def bootstrap_remove(cluster_node=None, quiet=False, yes_to_all=False):
+def bootstrap_remove(cluster_node=None, quiet=False, yes_to_all=False,
force=False):
"""
-c - node to remove from cluster
-q - quiet
-y - yes to all
+-f - force removal of self
"""
global _context
_context = Context(quiet=quiet, yes_to_all=yes_to_all)
@@ -1573,7 +1574,7 @@ def bootstrap_remove(cluster_node=None, quiet=False,
yes_to_all=False):
init()
remove_ssh()
if remove_localhost_check():
-if not config.core.force:
+if not config.core.force and not force:
error("Removing self requires --force")
# get list of cluster nodes
me = utils.this_node()
diff --git a/crmsh/ui_cluster.py b/crmsh/ui_cluster.py
index 96166713..9be66522 100644
--- a/crmsh/ui_cluster.py
+++ b/crmsh/ui_cluster.py
@@ -288,6 +288,7 @@ If stage is not specified, each stage will be invoked in
sequence.
parser.add_option("-q", "--quiet", help="Be quiet (don't describe
what's happening, just do it)", action="store_true", dest="quiet")
parser.add_option("-y", "--yes", help='Answer "yes" to all prompts
(use with caution)', action="store_true", dest="yes_to_all")
parser.add_option("-c", "--cluster-node", dest="cluster_node",
help="IP address or hostname of cluster node which will be deleted",
metavar="HOST")
+parser.add_option("-F", "--force", dest="force", help="Remove current
node", action="store_true")
options, args = parser.parse_args(list(args))
if options.cluster_node is not None and options.cluster_node not in
args:
@@ -302,7 +303,8 @@ If stage is not specified, each stage will be invoked in
sequence.
bootstrap.bootstrap_remove(
cluster_node=node,
quiet=options.quiet,
-
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2017-06-09 15:56:31
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Fri Jun 9 15:56:31 2017 rev:123 rq:500621 version:3.0.0
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-05-10
20:53:19.887022863 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-06-09
15:56:32.223039733 +0200
@@ -1,0 +2,6 @@
+Fri Jun 2 11:34:32 UTC 2017 - kgronl...@suse.com
+
+- medium: history: Revert preference of messages over ha-log.txt (bsc#1031138)
+ * Add 0014-medium-history-Revert-preference-of-messages-over-ha.patch
+
+---
New:
0014-medium-history-Revert-preference-of-messages-over-ha.patch
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.WoQs7D/_old 2017-06-09 15:56:33.130911593 +0200
+++ /var/tmp/diff_new_pack.WoQs7D/_new 2017-06-09 15:56:33.130911593 +0200
@@ -68,6 +68,8 @@
Patch12:0012-doc-geo-join-requires-clusters-argument-bsc-1037442.patch
# PATCH-FIX-UPSTREAM: medium: bootstrap: Make arbitrator argument optional
(bsc#1038386)
Patch13:0013-medium-bootstrap-Make-arbitrator-argument-optional-b.patch
+# PATCH-FIX-UPSTREAM: medium: history: Revert preference of messages over
ha-log.txt (bsc#1031138)
+Patch14:0014-medium-history-Revert-preference-of-messages-over-ha.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
@@ -183,6 +185,7 @@
%patch11 -p1
%patch12 -p1
%patch13 -p1
+%patch14 -p1
# Force the local time
#
++ 0014-medium-history-Revert-preference-of-messages-over-ha.patch ++
>From dd7a5db2ab556eb125b73c01e587d855dcb1adc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?=
Date: Fri, 2 Jun 2017 13:24:39 +0200
Subject: [PATCH] medium: history: Revert preference of messages over
ha-log.txt (bsc#1031138)
The best fix to this problem would be to combine all available
log files for a node into a single stream. A temporary improvement
is to prefer ha-log.txt over messages, which should be a better
choice if hb_report selected the correct log file.
Partially reverts 2.3.1-3-g99f2056f.
---
crmsh/history.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crmsh/history.py b/crmsh/history.py
index 192563a8..d61e30e2 100644
--- a/crmsh/history.py
+++ b/crmsh/history.py
@@ -18,7 +18,7 @@ from . import utils
from .msg import common_debug, common_warn, common_err, common_error,
common_info, warn_once
-_LOG_FILES = ("messages", "ha-log.txt", "ha-log", "cluster-log.txt",
"journal.log", "pacemaker.log")
+_LOG_FILES = ("ha-log.txt", "messages", "ha-log", "cluster-log.txt",
"journal.log", "pacemaker.log")
#
--
2.12.2
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2017-05-10 20:53:18
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Wed May 10 20:53:18 2017 rev:122 rq:493999 version:3.0.0
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-05-06
18:30:20.153432682 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-05-10
20:53:19.887022863 +0200
@@ -1,0 +2,6 @@
+Wed May 10 06:46:09 UTC 2017 - kgronl...@suse.com
+
+- medium: bootstrap: Make arbitrator argument optional (bsc#1038386)
+ * Add 0013-medium-bootstrap-Make-arbitrator-argument-optional-b.patch
+
+---
New:
0013-medium-bootstrap-Make-arbitrator-argument-optional-b.patch
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.gvLPv6/_old 2017-05-10 20:53:21.166842265 +0200
+++ /var/tmp/diff_new_pack.gvLPv6/_new 2017-05-10 20:53:21.170841700 +0200
@@ -66,6 +66,8 @@
Patch11:0011-medium-bootstrap-Check-required-arguments-to-geo-joi.patch
# PATCH-FIX-UPSTREAM: doc: geo-join requires --clusters argument (bsc#1037442)
Patch12:0012-doc-geo-join-requires-clusters-argument-bsc-1037442.patch
+# PATCH-FIX-UPSTREAM: medium: bootstrap: Make arbitrator argument optional
(bsc#1038386)
+Patch13:0013-medium-bootstrap-Make-arbitrator-argument-optional-b.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
@@ -180,6 +182,7 @@
%patch10 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p1
# Force the local time
#
++ 0013-medium-bootstrap-Make-arbitrator-argument-optional-b.patch ++
>From 79a73793fc536d87348b8058615faa2464f3ec1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?=
Date: Wed, 10 May 2017 07:15:03 +0200
Subject: [PATCH] medium: bootstrap: Make arbitrator argument optional
(bsc#1038386)
---
crmsh/bootstrap.py | 27 +++
crmsh/ui_cluster.py | 8 +++-
doc/crm.8.adoc | 6 +++---
3 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/crmsh/bootstrap.py b/crmsh/bootstrap.py
index 16772244..3d648539 100644
--- a/crmsh/bootstrap.py
+++ b/crmsh/bootstrap.py
@@ -1631,7 +1631,7 @@ def create_booth_authkey():
def create_booth_config(arbitrator, clusters, tickets):
status("Configure booth")
-config_template = Template("""# The booth configuration file is
"/etc/booth/booth.conf". You need to
+config_template = """# The booth configuration file is
"/etc/booth/booth.conf". You need to
# prepare the same booth configuration file on each arbitrator and
# each node in the cluster sites where the booth daemon can be launched.
@@ -1639,21 +1639,16 @@ def create_booth_config(arbitrator, clusters, tickets):
# Currently only "UDP" is supported.
transport="UDP"
port="9929"
-arbitrator="$arbitrator"
-$sites
-authfile="$authkey"
-$tickets
-""")
-ticket_template = Template("""ticket="$name"
- expire="600"
-""")
-site_template = Template('site="$site"\n')
-
-cfg = config_template.substitute(
-arbitrator=arbitrator,
-sites="".join(site_template.substitute(site=s) for s in
clusters.itervalues()),
-authkey=BOOTH_AUTH,
-tickets="".join(ticket_template.substitute(name=t) for t in tickets))
+"""
+cfg = [config_template]
+if arbitrator is not None:
+cfg.append("arbitrator=\"{}\"".format(arbitrator))
+for s in clusters.itervalues():
+cfg.append("site=\"{}\"".format(s))
+cfg.append("authfile=\"{}\"".format(BOOTH_AUTH))
+for t in tickets:
+cfg.append("ticket=\"{}\"\nexpire=\"600\"".format(t))
+cfg = "\n".join(cfg) + "\n"
if os.path.exists(BOOTH_CFG):
invoke("rm -f {}".format(BOOTH_CFG))
diff --git a/crmsh/ui_cluster.py b/crmsh/ui_cluster.py
index 8730aa41..96166713 100644
--- a/crmsh/ui_cluster.py
+++ b/crmsh/ui_cluster.py
@@ -328,9 +328,9 @@ If stage is not specified, each stage will be invoked in
sequence.
Make this cluster a geo cluster.
Needs some information to set up.
-* arbitrator IP / hostname
* cluster map: "cluster-name=ip cluster-name=ip"
-* list of tickets
+* arbitrator IP / hostname (optional)
+* list of tickets (can be empty)
'''
parser = OptParser(usage="usage: geo-init [options]", epilog="""
@@ -355,12 +355,10 @@ Cluster Description
parser.add_option("--tickets", help="Tickets to create
(space-separated)", dest="tickets", metavar="LIST")
options, args = parser.parse_args(list(args))
-if options.clusters is
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2017-05-06 18:30:07
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Sat May 6 18:30:07 2017 rev:121 rq:492677 version:3.0.0
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-04-29
10:53:11.747012485 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-05-06
18:30:20.153432682 +0200
@@ -1,0 +2,12 @@
+Wed May 3 14:39:07 UTC 2017 - kgronl...@suse.com
+
+- doc: geo-join requires --clusters argument (bsc#1037442)
+ * Add 0012-doc-geo-join-requires-clusters-argument-bsc-1037442.patch
+- medium: bootstrap: Check required arguments to geo-join (bsc#1037421)
+ * Add 0011-medium-bootstrap-Check-required-arguments-to-geo-joi.patch
+- medium: bootstrap: Handle failure to fetch config gracefully (bsc#1037423)
+ * Add 0010-medium-bootstrap-Handle-failure-to-fetch-config-grac.patch
+- medium: bootstrap: Enable "help geo-init" etc. (bsc#1037417)
+ * Add 0009-medium-bootstrap-Enable-help-geo-init-etc.-bsc-10374.patch
+
+---
New:
0009-medium-bootstrap-Enable-help-geo-init-etc.-bsc-10374.patch
0010-medium-bootstrap-Handle-failure-to-fetch-config-grac.patch
0011-medium-bootstrap-Check-required-arguments-to-geo-joi.patch
0012-doc-geo-join-requires-clusters-argument-bsc-1037442.patch
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.Cmb00H/_old 2017-05-06 18:30:22.013170263 +0200
+++ /var/tmp/diff_new_pack.Cmb00H/_new 2017-05-06 18:30:22.017169699 +0200
@@ -58,6 +58,14 @@
Patch7: 0007-medium-bootstrap-Set-expected_votes-based-on-actual-.patch
# PATCH-FIX-UPSTREAM: high: cibconfig: Graph file output option was reversed
(bsc#1036595)
Patch8:
0008-high-cibconfig-Graph-file-output-option-was-reversed.patch
+# PATCH-FIX-UPSTREAM: medium: bootstrap: Enable "help geo-init" etc.
(bsc#1037417)
+Patch9: 0009-medium-bootstrap-Enable-help-geo-init-etc.-bsc-10374.patch
+# PATCH-FIX-UPSTREAM: medium: bootstrap: Handle failure to fetch config
gracefully (bsc#1037423)
+Patch10:0010-medium-bootstrap-Handle-failure-to-fetch-config-grac.patch
+# PATCH-FIX-UPSTREAM: medium: bootstrap: Check required arguments to geo-join
(bsc#1037421)
+Patch11:0011-medium-bootstrap-Check-required-arguments-to-geo-joi.patch
+# PATCH-FIX-UPSTREAM: doc: geo-join requires --clusters argument (bsc#1037442)
+Patch12:0012-doc-geo-join-requires-clusters-argument-bsc-1037442.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
@@ -168,6 +176,10 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
# Force the local time
#
++ 0009-medium-bootstrap-Enable-help-geo-init-etc.-bsc-10374.patch ++
>From 978ecd9069dc42bed7db082a18fd0e1f5f1a059d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?=
Date: Wed, 3 May 2017 16:10:54 +0200
Subject: [PATCH 09/12] medium: bootstrap: Enable "help geo-init" etc.
(bsc#1037417)
---
crmsh/ui_cluster.py | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/crmsh/ui_cluster.py b/crmsh/ui_cluster.py
index 6b143c35..8f58a97e 100644
--- a/crmsh/ui_cluster.py
+++ b/crmsh/ui_cluster.py
@@ -311,7 +311,8 @@ If stage is not specified, each stage will be invoked in
sequence.
except ValueError:
return None
-@command.name("geo-init")
+@command.name("geo_init")
+@command.alias("geo-init")
@command.skill_level('administrator')
def do_geo_init(self, context, *args):
'''
@@ -365,7 +366,8 @@ Cluster Description
bootstrap.bootstrap_init_geo(options.quiet, options.yes_to_all,
options.arbitrator, clustermap, ticketlist)
return True
-@command.name("geo-join")
+@command.name("geo_join")
+@command.alias("geo-join")
@command.skill_level('administrator')
def do_geo_join(self, context, *args):
'''
@@ -383,7 +385,8 @@ Cluster Description
bootstrap.bootstrap_join_geo(options.quiet, options.yes_to_all,
options.node, clustermap)
return True
-@command.name("geo-init-arbitrator")
+@command.name("geo_init_arbitrator")
+@command.alias("geo-init-arbitrator")
@command.skill_level('administrator')
def do_geo_init_arbitrator(self, context, *args):
'''
--
2.12.2
++ 0010-medium-bootstrap-Handle-failure-to-fetch-config-grac.patch ++
>From 0e3644538d7c3a9ccc77e68ffe3281ac06ba4c24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?=
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2017-04-29 10:53:10
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Sat Apr 29 10:53:10 2017 rev:120 rq:491593 version:3.0.0
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-04-25
08:59:05.963359332 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-04-29
10:53:11.747012485 +0200
@@ -1,0 +2,6 @@
+Thu Apr 27 12:52:59 UTC 2017 - kgronl...@suse.com
+
+- high: cibconfig: Graph file output option was reversed (bsc#1036595)
+- Add 0008-high-cibconfig-Graph-file-output-option-was-reversed.patch
+
+---
New:
0008-high-cibconfig-Graph-file-output-option-was-reversed.patch
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.OUK3nv/_old 2017-04-29 10:53:12.734872931 +0200
+++ /var/tmp/diff_new_pack.OUK3nv/_new 2017-04-29 10:53:12.738872366 +0200
@@ -56,6 +56,8 @@
Patch6: 0006-remove-bindnetaddr-for-unicast-bsc-1030437.patch
# PATCH-FIX-UPSTREAM: medium: bootstrap: Set expected votes based on actual
node count (bsc#1033288)
Patch7: 0007-medium-bootstrap-Set-expected_votes-based-on-actual-.patch
+# PATCH-FIX-UPSTREAM: high: cibconfig: Graph file output option was reversed
(bsc#1036595)
+Patch8:
0008-high-cibconfig-Graph-file-output-option-was-reversed.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
@@ -165,6 +167,7 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
# Force the local time
#
++ 0008-high-cibconfig-Graph-file-output-option-was-reversed.patch ++
>From 3c294bb369fece0858ae5a186a5d04e513765070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?=
Date: Thu, 27 Apr 2017 14:39:24 +0200
Subject: [PATCH] high: cibconfig: Graph file output option was reversed
(bsc#1036595)
---
crmsh/cibconfig.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crmsh/cibconfig.py b/crmsh/cibconfig.py
index 5af2b23c..21d44296 100644
--- a/crmsh/cibconfig.py
+++ b/crmsh/cibconfig.py
@@ -380,7 +380,7 @@ class CibObjectSet(object):
rc, d = utils.load_graphviz_file(userdir.GRAPHVIZ_USER_FILE)
if rc and d:
constants.graph = d
-if outf is not None:
+if outf is None:
return self.show_graph(gtype)
elif gtype == ftype:
rc = self.save_graph(gtype, outf)
--
2.12.0
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2017-04-25 08:59:05
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Tue Apr 25 08:59:05 2017 rev:119 rq:490289 version:3.0.0
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-04-24
09:49:15.651908733 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-04-25
08:59:05.963359332 +0200
@@ -1,0 +2,7 @@
+Mon Apr 24 12:17:13 UTC 2017 - kgronl...@suse.com
+
+- low: bootstrap: Update fix for formatting SBD device (bsc#1028704)
+- medium: bootstrap: Set expected votes based on actual node count
(bsc#1033288)
+- Add 0007-medium-bootstrap-Set-expected_votes-based-on-actual-.patch
+
+---
New:
0007-medium-bootstrap-Set-expected_votes-based-on-actual-.patch
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.0aHcUq/_old 2017-04-25 08:59:06.759246796 +0200
+++ /var/tmp/diff_new_pack.0aHcUq/_new 2017-04-25 08:59:06.763246230 +0200
@@ -54,6 +54,9 @@
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
+# PATCH-FIX-UPSTREAM: medium: bootstrap: Set expected votes based on actual
node count (bsc#1033288)
+Patch7: 0007-medium-bootstrap-Set-expected_votes-based-on-actual-.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
# Requiring pacemaker makes crmsh harder to build on other distributions,
@@ -161,6 +164,7 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
# Force the local time
#
++ 0002-low-bootstrap-Fix-warning-for-formatting-SBD-device-.patch ++
--- /var/tmp/diff_new_pack.0aHcUq/_old 2017-04-25 08:59:06.795241706 +0200
+++ /var/tmp/diff_new_pack.0aHcUq/_new 2017-04-25 08:59:06.795241706 +0200
@@ -1,26 +1,28 @@
-From 6bbb4fba305d8eeb921b63f579d9703c633ed7ca Mon Sep 17 00:00:00 2001
+From 4c892429494031ed45f8cc36df714f58cc2cdd43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?=
Date: Thu, 9 Mar 2017 20:27:19 +0100
-Subject: [PATCH 2/4] low: bootstrap: Fix warning for formatting SBD device
+Subject: [PATCH] low: bootstrap: Fix warning for formatting SBD device
(bsc#1028704)
---
- crmsh/bootstrap.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ crmsh/bootstrap.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/crmsh/bootstrap.py b/crmsh/bootstrap.py
-index 2b2e167a..26d5f124 100644
+index 2b2e167a..2fec7dbf 100644
--- a/crmsh/bootstrap.py
+++ b/crmsh/bootstrap.py
-@@ -940,7 +940,7 @@ Configure SBD:
+@@ -940,8 +940,8 @@ Configure SBD:
if not is_block_device(dev):
print >>sys.stderr, "That doesn't look like a block
device"
else:
-status("All data on $dev will be destroyed")
+-if confirm('Are you sure you wish to use this device'):
+warn("All data on {} will be destroyed!".format(dev))
- if confirm('Are you sure you wish to use this device'):
++if confirm('Are you sure you wish to use this device?'):
dev_looks_sane = True
else:
+ dev = ""
--
-2.11.1
+2.12.0
++ 0007-medium-bootstrap-Set-expected_votes-based-on-actual-.patch ++
>From 03e673e76415590ef34cbf2d08dcfd3b530bb74a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?=
Date: Mon, 10 Apr 2017 17:47:55 +0200
Subject: [PATCH] medium: bootstrap: Set expected_votes based on actual node
count (bsc#1033288)
Initialize the cluster before setting expected_votes.
Query the cluster to find out how many nodes there are (so as
not to adjust multiple times if a previous attempt to join the
cluster failed).
---
crmsh/bootstrap.py | 40 +++-
1 file changed, 31 insertions(+), 9 deletions(-)
diff --git a/crmsh/bootstrap.py b/crmsh/bootstrap.py
index 2b2e167a..bab3bd80 100644
--- a/crmsh/bootstrap.py
+++ b/crmsh/bootstrap.py
@@ -1240,17 +1240,39 @@ def join_cluster(seed_host):
if is_unicast:
corosync.add_node(utils.this_node())
-# Increase expected_votes
-new_quorum = 0
-for v in corosync.get_values("quorum.expected_votes"):
-new_quorum = int(v) + 1
-corosync.set_value("quorum.expected_votes", str(new_quorum))
-corosync.set_value("quorum.two_node", 1 if new_quorum == 2 else 0)
-
commit crmsh for openSUSE:Factory
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?=
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
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2017-03-16 09:42:39
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Thu Mar 16 09:42:39 2017 rev:117 rq:479431 version:3.0.0
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-03-02
19:38:14.475946197 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-03-16
09:51:35.897254393 +0100
@@ -1,0 +2,10 @@
+Wed Mar 15 07:04:44 UTC 2017 - kgronl...@suse.com
+
+- low: bootstrap: Fix warning for formatting SBD device (bsc#1028704)
+- medium: ui_cluster: Fix init with no arguments (bsc#1028735)
+- low: utils: Use /proc for process discovery
+- Add 0002-low-bootstrap-Fix-warning-for-formatting-SBD-device-.patch
+- Add 0003-medium-ui_cluster-Fix-init-with-no-arguments-bsc-102.patch
+- Add 0004-low-utils-Use-proc-for-process-discovery.patch
+
+---
New:
0002-low-bootstrap-Fix-warning-for-formatting-SBD-device-.patch
0003-medium-ui_cluster-Fix-init-with-no-arguments-bsc-102.patch
0004-low-utils-Use-proc-for-process-discovery.patch
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.mdASVE/_old 2017-03-16 09:51:36.489170567 +0100
+++ /var/tmp/diff_new_pack.mdASVE/_new 2017-03-16 09:51:36.489170567 +0100
@@ -44,6 +44,13 @@
Source0:%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM: Allow empty fencing topology (bsc#1025393)
Patch1: 0001-Allow-empty-fencing_topology-bsc-1025393.patch
+# PATCH-FIX-UPSTREAM: low: bootstrap: Fix warning for formatting SBD device
(bsc#1028704)
+Patch2: 0002-low-bootstrap-Fix-warning-for-formatting-SBD-device-.patch
+# PATCH-FIX-UPSTREAM: medium: ui_cluster: Fix init with no arguments
(bsc#1028735)
+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
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
# Requiring pacemaker makes crmsh harder to build on other distributions,
@@ -146,6 +153,9 @@
%prep
%setup -q
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
# Force the local time
#
++ 0002-low-bootstrap-Fix-warning-for-formatting-SBD-device-.patch ++
>From 6bbb4fba305d8eeb921b63f579d9703c633ed7ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?=
Date: Thu, 9 Mar 2017 20:27:19 +0100
Subject: [PATCH 2/4] low: bootstrap: Fix warning for formatting SBD device
(bsc#1028704)
---
crmsh/bootstrap.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crmsh/bootstrap.py b/crmsh/bootstrap.py
index 2b2e167a..26d5f124 100644
--- a/crmsh/bootstrap.py
+++ b/crmsh/bootstrap.py
@@ -940,7 +940,7 @@ Configure SBD:
if not is_block_device(dev):
print >>sys.stderr, "That doesn't look like a block device"
else:
-status("All data on $dev will be destroyed")
+warn("All data on {} will be destroyed!".format(dev))
if confirm('Are you sure you wish to use this device'):
dev_looks_sane = True
else:
--
2.11.1
++ 0003-medium-ui_cluster-Fix-init-with-no-arguments-bsc-102.patch ++
>From 5ea0f8480fc7bb9894e0581ef3e0afa3b3ea11e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?=
Date: Thu, 9 Mar 2017 21:49:09 +0100
Subject: [PATCH 3/4] medium: ui_cluster: Fix init with no arguments
(bsc#1028735)
---
crmsh/ui_cluster.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/crmsh/ui_cluster.py b/crmsh/ui_cluster.py
index 762e6bfd..6b143c35 100644
--- a/crmsh/ui_cluster.py
+++ b/crmsh/ui_cluster.py
@@ -104,8 +104,9 @@ class Cluster(command.UI):
def looks_like_hostnames(lst):
sectionlist = bootstrap.INIT_STAGES
return all(not (l.startswith('-') or l in sectionlist) for l in
lst)
-if '--dry-run' in args or looks_like_hostnames(args):
-args = ['--yes', '--nodes'] + [arg for arg in args if arg !=
'--dry-run']
+if len(args) > 0:
+if '--dry-run' in args or looks_like_hostnames(args):
+args = ['--yes', '--nodes'] + [arg for arg in args if arg !=
'--dry-run']
parser = OptParser(usage="usage: init [options] [STAGE]", epilog="""
Stage can be one of:
--
2.11.1
++ 0004-low-utils-Use-proc-for-process-discovery.patch ++
>From 931abc46808ff427134031765835fb3f803a40ef Mon Sep 17 00:00:00 2001
From:
commit crmsh for openSUSE:Factory
Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2017-03-02 19:38:13 Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new (New) Package is "crmsh" Thu Mar 2 19:38:13 2017 rev:116 rq:460814 version:3.0.0 Changes: --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-02-20 13:13:52.710720042 +0100 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-03-02 19:38:14.475946197 +0100 @@ -2 +2 @@ -Tue Jan 31 15:50:51 UTC 2017 - kgronl...@suse.com +Tue Feb 28 07:30:42 UTC 2017 - kgronl...@suse.com @@ -4,3 +4,2 @@ -- Update to version 3.0.0: - * give the op's hint when type tab after 'op' - * medium: bootstrap: Configure hawk iff package installed +- Allow empty fencing topology (bsc#1025393) +- Add 0001-Allow-empty-fencing_topology-bsc-1025393.patch @@ -9,9 +8 @@ -Wed Jan 04 15:29:45 UTC 2017 - kgronl...@suse.com - -- Update to version 2.3.2+git.1483543612.cf853f8: - * medium: ui_cluster: Fix broken cluster remove command - * medium: bootstrap: Invoke _remote commands correctly - * low: ui_cluster: No need to check the cluster stack in requires - * low: bootstrap: Avoid warning if known_hosts doesn't exist - * low: bootstrap: Handle None as result from remote command correctly - * low: bootstrap: Don't check for ptty for _remote stages +Tue Jan 31 16:17:09 UTC 2017 - kgronl...@suse.com @@ -19,4 +10 @@ -Fri Dec 16 08:05:28 UTC 2016 - kgronl...@suse.com - -- Update to version 2.3.2+git.1481875498.8cd1dd9: +- Update to version 3.0.0: @@ -24 +11,0 @@ - * high: scripts: Remove script versions of add/remove/init @@ -26 +12,0 @@ - * medium: ui_cluster: Compatibility mode for old cluster init behavior @@ -30,2 +16 @@ - * low: ui_script: Fix script list all/names argument handling - * low: ui: Fix vim highlightning support. + * medium: ui_cluster: Fix broken cluster remove command @@ -33,7 +17,0 @@ - * low: ui_cluster: start/stop don't touch corosync, just pacemaker - -Tue Oct 25 11:46:42 UTC 2016 - kgronl...@suse.com - -- Update to version 2.3.1+git.1477204932.7939b51: - * medium: corosync: Fix missing variable in del-node @@ -42 +20,5 @@ - * doc: Fix inverted boolean in resource set documentation + * low: ui_cluster: start/stop don't touch corosync, just pacemaker + * low: ui_script: Fix script list all/names argument handling + * low: ui: Fix vim highlightning support. + * low: ui_cluster: No need to check the cluster stack in requires + * low: completers: give the op's hint when type tab after 'op' @@ -45 +27 @@ -Wed Oct 05 09:14:50 UTC 2016 - kgronl...@suse.com +Wed Nov 02 23:57:57 UTC 2016 - kgronl...@suse.com @@ -47 +29 @@ -- Update to version 2.3.1+git.1475245522.4172084: +- Update to version 2.2.0+git.1476084519.a000372: @@ -53,0 +36 @@ + * medium: corosync: Fix missing variable in del-node @@ -57 +40 @@ -Thu Sep 15 07:26:16 UTC 2016 - kgronl...@suse.com +Thu Sep 15 07:28:54 UTC 2016 - kgronl...@suse.com @@ -59 +42 @@ -- Update to version 2.3.1+git.1473924149.8abc212: +- Update to version 2.2.0+git.1473924149.8abc212: @@ -70,6 +52,0 @@ -Mon Aug 15 06:01:21 UTC 2016 - kgronl...@suse.com - -- Update to version 2.3.0+git.1470991992.7deaa3a: - * Release 2.3.0 - @@ -177,13 +153,0 @@ -Thu Mar 31 06:00:48 UTC 2016 - kgronl...@suse.com - -- Update to version 2.2.0+git.1459359704.8d9b910: - + medium: scripts: Use os.uname() to find hostname (#128) - + low: logparser: Don't crash on nodes without logs - + low: history: Don't skip nodes without logs - + low: parser: ignore case for attr: prefix - + low: scripts: Need sudo if non-local call - + low: history: update the syslog format matching - + low: report: add information about booth - + low: report: if present, use the subsecond part from syslog timestamps - @@ -240,0 +205,3 @@ + + high: scripts: Add LVM on DRBD cluster script (bsc#951132) + + high: scripts: Add NFS on LVM and DRBD cluster script (bsc#951132) + + high: added the "push" method to the "configure load" command (fate#320389) @@ -243,7 +210,2 @@ - + low: Fix title style vs. sentence style in cluster scripts (bsc#892108) - -Thu Feb 04 07:00:04 UTC 2016 - kgronl...@suse.com - -- Update to version 2.2.0+git.1454489864.2aa76e4: - + medium: corosync: added optional parameter [name] to "corosync add-node" function + + medium: hb_report: Don't collect logs on non-nodes (bsc#959031) + + medium: ui_configure: Only wait for DC if resources were stopped (#117) @@ -251,8 +213
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2017-02-20 13:13:51
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-01-23
11:39:07.811068754 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-02-20
13:13:52.710720042 +0100
@@ -1,0 +2,7 @@
+Tue Jan 31 15:50:51 UTC 2017 - kgronl...@suse.com
+
+- Update to version 3.0.0:
+ * give the op's hint when type tab after 'op'
+ * medium: bootstrap: Configure hawk iff package installed
+
+---
Old:
crmsh-2.3.2+git.1483543612.cf853f8.tar.bz2
New:
crmsh-3.0.0.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.dUkwgW/_old 2017-02-20 13:13:53.202650883 +0100
+++ /var/tmp/diff_new_pack.dUkwgW/_new 2017-02-20 13:13:53.202650883 +0100
@@ -38,7 +38,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:2.3.2+git.1483543612.cf853f8
+Version:3.0.0
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _service ++
--- /var/tmp/diff_new_pack.dUkwgW/_old 2017-02-20 13:13:53.238645823 +0100
+++ /var/tmp/diff_new_pack.dUkwgW/_new 2017-02-20 13:13:53.238645823 +0100
@@ -3,8 +3,8 @@
git://github.com/ClusterLabs/crmsh.git
git
crmsh
-2.3.2+git.%ct.%h
-master
+3.0.0
+3.0.0
enable
++ _servicedata ++
--- /var/tmp/diff_new_pack.dUkwgW/_old 2017-02-20 13:13:53.278640200 +0100
+++ /var/tmp/diff_new_pack.dUkwgW/_new 2017-02-20 13:13:53.282639638 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- cf853f84636ccf8432b1cba6c64c4b782dcd3e90
\ No newline at end of file
+ 7baa848d3adaaf5727a76c6e59348048b1b8e6d4
\ No newline at end of file
++ crmsh-2.3.2+git.1483543612.cf853f8.tar.bz2 -> crmsh-3.0.0.tar.bz2 ++
5894 lines of diff (skipped)
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2017-01-23 11:39:07
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2017-01-10
10:43:59.527039189 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2017-01-23
11:39:07.811068754 +0100
@@ -1,0 +2,11 @@
+Wed Jan 04 15:29:45 UTC 2017 - kgronl...@suse.com
+
+- Update to version 2.3.2+git.1483543612.cf853f8:
+ * medium: ui_cluster: Fix broken cluster remove command
+ * medium: bootstrap: Invoke _remote commands correctly
+ * low: ui_cluster: No need to check the cluster stack in requires
+ * low: bootstrap: Avoid warning if known_hosts doesn't exist
+ * low: bootstrap: Handle None as result from remote command correctly
+ * low: bootstrap: Don't check for ptty for _remote stages
+
+---
Old:
crmsh-2.3.2+git.1481875498.8cd1dd9.tar.bz2
New:
crmsh-2.3.2+git.1483543612.cf853f8.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.9ZclhS/_old 2017-01-23 11:39:08.358991042 +0100
+++ /var/tmp/diff_new_pack.9ZclhS/_new 2017-01-23 11:39:08.358991042 +0100
@@ -1,7 +1,7 @@
#
# spec file for package crmsh
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -38,7 +38,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:2.3.2+git.1481875498.8cd1dd9
+Version:2.3.2+git.1483543612.cf853f8
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.9ZclhS/_old 2017-01-23 11:39:08.406984235 +0100
+++ /var/tmp/diff_new_pack.9ZclhS/_new 2017-01-23 11:39:08.406984235 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 8cd1dd93177cde41701277ca8804c2ebbd3f2d4a
\ No newline at end of file
+ cf853f84636ccf8432b1cba6c64c4b782dcd3e90
\ No newline at end of file
++ crmsh-2.3.2+git.1481875498.8cd1dd9.tar.bz2 ->
crmsh-2.3.2+git.1483543612.cf853f8.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.3.2+git.1481875498.8cd1dd9/crmsh/bootstrap.py
new/crmsh-2.3.2+git.1483543612.cf853f8/crmsh/bootstrap.py
--- old/crmsh-2.3.2+git.1481875498.8cd1dd9/crmsh/bootstrap.py 2016-12-16
09:04:58.0 +0100
+++ new/crmsh-2.3.2+git.1483543612.cf853f8/crmsh/bootstrap.py 2017-01-04
16:26:52.0 +0100
@@ -600,7 +600,7 @@
invoke("csync2 -rxv %s" % (path))
-def init_csync2_remote(newhost):
+def init_csync2_remote():
"""
It would be nice if we could just have csync2.cfg include a directory,
which in turn included one file per node which would be referenced via
@@ -612,6 +612,7 @@
remote node to csync2 config on some existing node. It is intentionally
not documented in ha-cluster-init's user-visible usage information.
"""
+newhost = _context.cluster_node
if not newhost:
error("Hostname not specified")
@@ -1168,13 +1169,14 @@
# checking) ensures that at least *this* host has every other host in its
# known_hosts
known_hosts_new = set()
-log("parallax.call {} : {}".format(hosts, "cat /root/.ssh/known_hosts"))
-results = parallax.call(hosts, "cat /root/.ssh/known_hosts", opts)
+cat_cmd = "[ -e /root/.ssh/known_hosts ] && cat /root/.ssh/known_hosts ||
true"
+log("parallax.call {} : {}".format(hosts, cat_cmd))
+results = parallax.call(hosts, cat_cmd, opts)
for host, result in results.iteritems():
if isinstance(result, parallax.Error):
warn("Failed to get known_hosts from {}: {}".format(host,
str(result)))
else:
-known_hosts_new.update(result[1].splitlines())
+known_hosts_new.update((result[1] or "").splitlines())
if known_hosts_new:
hoststxt = "\n".join(sorted(known_hosts_new))
tmpf = utils.str2tmp(hoststxt)
@@ -1382,7 +1384,7 @@
def bootstrap_init(cluster_name="hacluster", nic=None, ocfs2_device=None,
shared_device=None, sbd_device=None, quiet=False,
template=None, admin_ip=None, yes_to_all=False,
- unicast=False, watchdog=None, stage=None):
+ unicast=False,
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2016-10-26 13:29:20
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2016-10-10
16:21:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-10-26
13:29:21.0 +0200
@@ -1,0 +2,9 @@
+Tue Oct 25 11:46:42 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.3.1+git.1477204932.7939b51:
+ * medium: corosync: Fix missing variable in del-node
+ * low: crm_pssh: Fix nodenum envvar name
+ * low: cmd_status: More detail in verify output
+ * doc: Fix inverted boolean in resource set documentation
+
+---
Old:
crmsh-2.3.1+git.1475245522.4172084.tar.bz2
New:
crmsh-2.3.1+git.1477204932.7939b51.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.akL8xE/_old 2016-10-26 13:29:23.0 +0200
+++ /var/tmp/diff_new_pack.akL8xE/_new 2016-10-26 13:29:23.0 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:2.3.1+git.1475245522.4172084
+Version:2.3.1+git.1477204932.7939b51
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.akL8xE/_old 2016-10-26 13:29:23.0 +0200
+++ /var/tmp/diff_new_pack.akL8xE/_new 2016-10-26 13:29:23.0 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 41720845429e9a42d4273d70a6be5cc31e324849
\ No newline at end of file
+ d796a3b07ad5d1bd1637638bd1100175d066d24e
\ No newline at end of file
++ crmsh-2.3.1+git.1475245522.4172084.tar.bz2 ->
crmsh-2.3.1+git.1477204932.7939b51.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.3.1+git.1475245522.4172084/.travis.yml
new/crmsh-2.3.1+git.1477204932.7939b51/.travis.yml
--- old/crmsh-2.3.1+git.1475245522.4172084/.travis.yml 2016-09-30
16:25:22.0 +0200
+++ new/crmsh-2.3.1+git.1477204932.7939b51/.travis.yml 2016-10-23
08:42:12.0 +0200
@@ -1,15 +1,29 @@
---
-sudo: false
+sudo: required
+dist: trusty
language: python
python:
- - 2.6
- - 2.7
+ - "2.6"
+ - "2.7_with_system_site_packages"
+
+before_install:
+ - sudo add-apt-repository ppa:syseleven-platform/linux-ha -y
+ - sudo apt-get -qq update
+ - sudo apt-get install -y pacemaker libcluster-glue-dev automake autoconf
python-lxml python-dateutil python-setuptools python-yaml asciidoc pkg-config
+ - sudo dpkg -r --force-depends crmsh
install:
- pip install tox-travis
script:
- tox
+ - test/travis-tests.sh
+
+after_failure:
+ - sudo cat $TRAVIS_BUILD_DIR/crmtestout/regression.out
$TRAVIS_BUILD_DIR/crmtestout/crm.* /etc/apt/sources.list
+ - lsb_release -a
+ - whoami
+ - printenv | sort
notifications:
irc:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.3.1+git.1475245522.4172084/crmsh/cmd_status.py
new/crmsh-2.3.1+git.1477204932.7939b51/crmsh/cmd_status.py
--- old/crmsh-2.3.1+git.1475245522.4172084/crmsh/cmd_status.py 2016-09-30
16:25:22.0 +0200
+++ new/crmsh-2.3.1+git.1477204932.7939b51/crmsh/cmd_status.py 2016-10-23
08:42:12.0 +0200
@@ -127,9 +127,9 @@
'''
from . import config
if "ptest" in config.core.ptest:
-cmd1 = "crm_verify -LV; %s -L -" % (config.core.ptest)
+cmd1 = "crm_verify -LVVV; %s -L -" % (config.core.ptest)
else:
-cmd1 = "crm_verify -LV; %s -LjV" % (config.core.ptest)
+cmd1 = "crm_verify -LVVV; %s -LjV" % (config.core.ptest)
if "scores" in args:
cmd1 += " -s"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.3.1+git.1475245522.4172084/crmsh/corosync.py
new/crmsh-2.3.1+git.1477204932.7939b51/crmsh/corosync.py
--- old/crmsh-2.3.1+git.1475245522.4172084/crmsh/corosync.py2016-09-30
16:25:22.0 +0200
+++ new/crmsh-2.3.1+git.1477204932.7939b51/crmsh/corosync.py2016-10-23
08:42:12.0 +0200
@@ -444,6 +444,7 @@
if nth == -1:
return
+num_nodes = p.count('nodelist.node')
p.set('quorum.two_node', '1' if num_nodes == 2 else '0')
f = open(conf(), 'w')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.3.1+git.1475245522.4172084/crmsh/crm_pssh.py
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2016-10-10 16:21:08
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2016-09-16
11:02:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-10-10
16:21:09.0 +0200
@@ -1,0 +2,12 @@
+Wed Oct 05 09:14:50 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.3.1+git.1475245522.4172084:
+ * high: cibconfig: Ensure temp CIB is readable by crm_diff (bsc#999683)
+ * high: parse: Support target pattern in fencing topology
+ * medium: ui_configure: option to obscure passwords
+ * medium: cibconfig: Remove from tags when removing object
+ * medium: scripts: Better corosync defaults (bsc#1001164)
+ * medium: scripts: Drop logrotate check from cluster health
+ * low: cmd_status: Highlight plural forms (bsc#996806)
+
+---
Old:
crmsh-2.3.1+git.1473924149.8abc212.tar.bz2
New:
crmsh-2.3.1+git.1475245522.4172084.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.Vqe7mx/_old 2016-10-10 16:21:11.0 +0200
+++ /var/tmp/diff_new_pack.Vqe7mx/_new 2016-10-10 16:21:11.0 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:2.3.1+git.1473924149.8abc212
+Version:2.3.1+git.1475245522.4172084
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.Vqe7mx/_old 2016-10-10 16:21:11.0 +0200
+++ /var/tmp/diff_new_pack.Vqe7mx/_new 2016-10-10 16:21:11.0 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 8abc2127fd1acecdc40ae4e242c1c02eeead75eb
\ No newline at end of file
+ 41720845429e9a42d4273d70a6be5cc31e324849
\ No newline at end of file
++ crmsh-2.3.1+git.1473924149.8abc212.tar.bz2 ->
crmsh-2.3.1+git.1475245522.4172084.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.3.1+git.1473924149.8abc212/crmsh/cibconfig.py
new/crmsh-2.3.1+git.1475245522.4172084/crmsh/cibconfig.py
--- old/crmsh-2.3.1+git.1473924149.8abc212/crmsh/cibconfig.py 2016-09-15
09:26:16.0 +0200
+++ new/crmsh-2.3.1+git.1475245522.4172084/crmsh/cibconfig.py 2016-09-30
16:25:22.0 +0200
@@ -30,7 +30,7 @@
from .msg import invalid_id_err, cib_ver_unsupported_err
from .utils import ext_cmd, safe_open_w, pipe_string, safe_close_w, crm_msec
from .utils import ask, lines2cli, olist
-from .utils import page_string, cibadmin_can_patch, str2tmp
+from .utils import page_string, cibadmin_can_patch, str2tmp,
ensure_sudo_readable
from .utils import run_ptest, is_id_valid, edit_file, get_boolean,
filter_string
from .xmlutil import is_child_rsc, rsc_constraint, sanitize_cib, rename_id,
get_interesting_nodes
from .xmlutil import is_pref_location, get_topnode, new_cib,
get_rscop_defaults_meta_node
@@ -585,6 +585,12 @@
def repr(self, format_mode="ignored"):
"Return a string containing xml of all objects."
cib_elem = cib_factory.obj_set2cib(self.obj_set)
+
+from .utils import obscured
+for nvp in cib_elem.xpath('//nvpair'):
+if 'value' in nvp.attrib:
+nvp.set('value', obscured(nvp.get('name'), nvp.get('value')))
+
s = etree.tostring(cib_elem, pretty_print=True)
return '\n' + s
@@ -1923,7 +1929,9 @@
s = clidisplay.keyword(self.obj_type)
d = ordereddict.odict()
for c in self.node.iterchildren("fencing-level"):
-if "target-attribute" in c.attrib:
+if "target-pattern" in c.attrib:
+target = (None, c.get("target-pattern"))
+elif "target-attribute" in c.attrib:
target = (c.get("target-attribute"), c.get("target-value"))
else:
target = c.get("target")
@@ -1943,9 +1951,10 @@
def fmt_target(tgt):
if isinstance(tgt, tuple):
+if tgt[0] is None:
+return "pattern:%s" % (tgt[1])
return "attr:%s=%s" % tgt
-else:
-return tgt + ":"
+return tgt + ":"
return cli_format([s] + ["%s %s" % (fmt_target(x), ' '.join(dd[x]))
for x in dd.keys()],
break_lines=(format_mode > 0))
@@ -2558,13 +2567,14
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2016-09-16 11:02:04
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2016-09-07
11:45:53.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-09-16
11:02:07.0 +0200
@@ -1,0 +2,7 @@
+Thu Sep 15 07:26:16 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.3.1+git.1473924149.8abc212:
+ * high: history: Quote archive tarball name if it contains spaces
(bsc#998959)
+ * high: history: Prefer /var/log/messages over ha-log.txt (bsc#998891)
+
+---
Old:
crmsh-2.3.1+git.1472802925.a4a4041.tar.bz2
New:
crmsh-2.3.1+git.1473924149.8abc212.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.Kr4E1F/_old 2016-09-16 11:02:08.0 +0200
+++ /var/tmp/diff_new_pack.Kr4E1F/_new 2016-09-16 11:02:08.0 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:2.3.1+git.1472802925.a4a4041
+Version:2.3.1+git.1473924149.8abc212
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.Kr4E1F/_old 2016-09-16 11:02:08.0 +0200
+++ /var/tmp/diff_new_pack.Kr4E1F/_new 2016-09-16 11:02:08.0 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- a4a404123703a355e9cf9c94cecd401c3266c0d5
\ No newline at end of file
+ 8abc2127fd1acecdc40ae4e242c1c02eeead75eb
\ No newline at end of file
++ crmsh-2.3.1+git.1472802925.a4a4041.tar.bz2 ->
crmsh-2.3.1+git.1473924149.8abc212.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.3.1+git.1472802925.a4a4041/crmsh/history.py
new/crmsh-2.3.1+git.1473924149.8abc212/crmsh/history.py
--- old/crmsh-2.3.1+git.1472802925.a4a4041/crmsh/history.py 2016-09-02
09:56:25.0 +0200
+++ new/crmsh-2.3.1+git.1473924149.8abc212/crmsh/history.py 2016-09-15
09:26:16.0 +0200
@@ -18,7 +18,7 @@
from .msg import common_debug, common_warn, common_err, common_error,
common_info, warn_once
-_LOG_FILES = ("ha-log.txt", "ha-log", "cluster-log.txt", "messages",
"journal.log", "pacemaker.log")
+_LOG_FILES = ("messages", "ha-log.txt", "ha-log", "cluster-log.txt",
"journal.log", "pacemaker.log")
#
@@ -225,8 +225,8 @@
except Exception, msg:
common_err("%s: %s" % (tarball, msg))
return None
-common_debug("tar -x%s < %s" % (tar_unpack_option, bfname))
-rc = utils.pipe_cmd_nosudo("tar -x%s < %s" % (tar_unpack_option,
bfname))
+common_debug("tar -x%s < %s" % (tar_unpack_option,
utils.quote(bfname)))
+rc = utils.pipe_cmd_nosudo("tar -x%s < %s" % (tar_unpack_option,
utils.quote(bfname)))
if self.source == "live":
os.remove(bfname)
os.chdir(cwd)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.3.1+git.1472802925.a4a4041/crmsh/logparser.py
new/crmsh-2.3.1+git.1473924149.8abc212/crmsh/logparser.py
--- old/crmsh-2.3.1+git.1472802925.a4a4041/crmsh/logparser.py 2016-09-02
09:56:25.0 +0200
+++ new/crmsh-2.3.1+git.1473924149.8abc212/crmsh/logparser.py 2016-09-15
09:26:16.0 +0200
@@ -620,16 +620,20 @@
Load state from cache file
"""
fn = self._metafile()
-if os.path.isfile(fn) and time.time() - os.stat(fn).st_mtime <
_METADATA_CACHE_AGE:
-try:
-with open(fn, 'rb') as f:
-try:
-if not self.from_dict(json.load(f)):
-return False
-crmlog.common_debug("Transition metadata loaded from
%s" % (fn))
-return True
-except ValueError as e:
-crmlog.common_debug("Failed to load metadata: %s" %
(e))
-except IOError as e:
-return False
+if os.path.isfile(fn):
+meta_mtime = os.stat(fn).st_mtime
+logf_mtime = max([os.stat(f).st_mtime for f in self.filenames if
os.path.isfile(f)])
+
+if meta_mtime >= logf_mtime and time.time() - meta_mtime <
_METADATA_CACHE_AGE:
+try:
+with open(fn, 'rb') as f:
+try:
+
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2016-09-07 11:45:44
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2016-08-17
12:04:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-09-07
11:45:53.0 +0200
@@ -1,0 +2,6 @@
+Fri Sep 02 07:56:25 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.3.1+git.1472802925.a4a4041:
+ * Require Python 2.6+, not 2.7 (bsc#995611)
+
+---
Old:
crmsh-2.3.0+git.1470991992.7deaa3a.tar.bz2
New:
crmsh-2.3.1+git.1472802925.a4a4041.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.0bUpGu/_old 2016-09-07 11:45:55.0 +0200
+++ /var/tmp/diff_new_pack.0bUpGu/_new 2016-09-07 11:45:55.0 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:2.3.0+git.1470991992.7deaa3a
+Version:2.3.1+git.1472802925.a4a4041
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _service ++
--- /var/tmp/diff_new_pack.0bUpGu/_old 2016-09-07 11:45:55.0 +0200
+++ /var/tmp/diff_new_pack.0bUpGu/_new 2016-09-07 11:45:55.0 +0200
@@ -3,7 +3,7 @@
git://github.com/ClusterLabs/crmsh.git
git
crmsh
-2.3.0+git.%ct.%h
+2.3.1+git.%ct.%h
master
enable
++ _servicedata ++
--- /var/tmp/diff_new_pack.0bUpGu/_old 2016-09-07 11:45:55.0 +0200
+++ /var/tmp/diff_new_pack.0bUpGu/_new 2016-09-07 11:45:55.0 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 7deaa3a022f1b817640fe7d7ab7d956dded50caa
\ No newline at end of file
+ a4a404123703a355e9cf9c94cecd401c3266c0d5
\ No newline at end of file
++ crmsh-2.3.0+git.1470991992.7deaa3a.tar.bz2 ->
crmsh-2.3.1+git.1472802925.a4a4041.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.3.0+git.1470991992.7deaa3a/ChangeLog
new/crmsh-2.3.1+git.1472802925.a4a4041/ChangeLog
--- old/crmsh-2.3.0+git.1470991992.7deaa3a/ChangeLog2016-08-15
08:01:21.0 +0200
+++ new/crmsh-2.3.1+git.1472802925.a4a4041/ChangeLog2016-09-02
09:56:25.0 +0200
@@ -1,3 +1,7 @@
+* Fri Sep 2 2016 Kristoffer Grönlund and many others
+- Release 2.3.1
+- Require Python 2.6+, not 2.7 (bsc#995611) (#152)
+
* Fri Aug 12 2016 Kristoffer Grönlund and many others
- Release 2.3.0
- medium: constants: Add missing alerts constants (#150) (bsc#992789)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.3.0+git.1470991992.7deaa3a/configure.ac
new/crmsh-2.3.1+git.1472802925.a4a4041/configure.ac
--- old/crmsh-2.3.0+git.1470991992.7deaa3a/configure.ac 2016-08-15
08:01:21.0 +0200
+++ new/crmsh-2.3.1+git.1472802925.a4a4041/configure.ac 2016-09-02
09:56:25.0 +0200
@@ -8,7 +8,7 @@
AC_PREREQ([2.53])
-AC_INIT([crmsh],[2.3.0],[us...@clusterlabs.org])
+AC_INIT([crmsh],[2.3.1],[us...@clusterlabs.org])
AC_ARG_WITH(version,
[ --with-version=version Override package version (if you're a packager
needing to pretend) ],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.3.0+git.1470991992.7deaa3a/crm
new/crmsh-2.3.1+git.1472802925.a4a4041/crm
--- old/crmsh-2.3.0+git.1470991992.7deaa3a/crm 2016-08-15 08:01:21.0
+0200
+++ new/crmsh-2.3.1+git.1472802925.a4a4041/crm 2016-09-02 09:56:25.0
+0200
@@ -22,7 +22,7 @@
import sys
from distutils import version
-minimum_version = '2.7'
+minimum_version = '2.6'
v_min = version.StrictVersion(minimum_version)
v_this = version.StrictVersion(sys.version[:3])
if v_min > v_this:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.3.0+git.1470991992.7deaa3a/crmsh/ui_script.py
new/crmsh-2.3.1+git.1472802925.a4a4041/crmsh/ui_script.py
--- old/crmsh-2.3.0+git.1470991992.7deaa3a/crmsh/ui_script.py 2016-08-15
08:01:21.0 +0200
+++ new/crmsh-2.3.1+git.1472802925.a4a4041/crmsh/ui_script.py 2016-09-02
09:56:25.0 +0200
@@ -346,7 +346,7 @@
"""
import yaml
import os
-from collections import OrderedDict
+from .ordereddict import OrderedDict
def flatten(script):
if not isinstance(script, dict):
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2016-08-17 12:04:56
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2016-08-09
22:16:00.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-08-17
12:04:59.0 +0200
@@ -1,0 +2,6 @@
+Mon Aug 15 06:01:21 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.3.0+git.1470991992.7deaa3a:
+ * Release 2.3.0
+
+---
Old:
crmsh-2.2.0+git.1470743271.64d1a40.tar.bz2
New:
crmsh-2.3.0+git.1470991992.7deaa3a.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.2l3rvq/_old 2016-08-17 12:05:00.0 +0200
+++ /var/tmp/diff_new_pack.2l3rvq/_new 2016-08-17 12:05:00.0 +0200
@@ -32,13 +32,11 @@
%{!?python_sitelib: %define python_sitelib %(python -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define version_unconverted 2.2.0+git.1470743271.64d1a40
-
Name: crmsh
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:2.2.0+git.1470743271.64d1a40
+Version:2.3.0+git.1470991992.7deaa3a
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _service ++
--- /var/tmp/diff_new_pack.2l3rvq/_old 2016-08-17 12:05:00.0 +0200
+++ /var/tmp/diff_new_pack.2l3rvq/_new 2016-08-17 12:05:00.0 +0200
@@ -3,7 +3,7 @@
git://github.com/ClusterLabs/crmsh.git
git
crmsh
-2.2.0+git.%ct.%h
+2.3.0+git.%ct.%h
master
enable
++ _servicedata ++
--- /var/tmp/diff_new_pack.2l3rvq/_old 2016-08-17 12:05:00.0 +0200
+++ /var/tmp/diff_new_pack.2l3rvq/_new 2016-08-17 12:05:00.0 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 64d1a40b8ed79e17973af5d9159eca3e703cf8e8
\ No newline at end of file
+ 7deaa3a022f1b817640fe7d7ab7d956dded50caa
\ No newline at end of file
++ crmsh-2.2.0+git.1470743271.64d1a40.tar.bz2 ->
crmsh-2.3.0+git.1470991992.7deaa3a.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1470743271.64d1a40/AUTHORS
new/crmsh-2.3.0+git.1470991992.7deaa3a/AUTHORS
--- old/crmsh-2.2.0+git.1470743271.64d1a40/AUTHORS 2016-08-09
13:54:54.0 +0200
+++ new/crmsh-2.3.0+git.1470991992.7deaa3a/AUTHORS 2016-08-15
08:01:21.0 +0200
@@ -24,6 +24,7 @@
Michael Prokop
Motaharu Kobu
NAKAHIRA Kazutomo
+ Nate Clark
nozawat
Pedro Salgado
Richard B Winters
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1470743271.64d1a40/ChangeLog
new/crmsh-2.3.0+git.1470991992.7deaa3a/ChangeLog
--- old/crmsh-2.2.0+git.1470743271.64d1a40/ChangeLog2016-08-09
13:54:54.0 +0200
+++ new/crmsh-2.3.0+git.1470991992.7deaa3a/ChangeLog2016-08-15
08:01:21.0 +0200
@@ -1,3 +1,97 @@
+* Fri Aug 12 2016 Kristoffer Grönlund and many others
+- Release 2.3.0
+- medium: constants: Add missing alerts constants (#150) (bsc#992789)
+- high: hb_report: Don't collect logs from journalctl if -M is set (bsc#990025)
+- high: hb_report: Skip lines without timestamps in log correctly (bsc#989810)
+- low: scripts: Fix use of non-relative import for ra
+- medium: tmpfiles: Create temporary directory if non-existing (bsc#981583)
+- medium: xmlutil: reduce unknown attribute to warning (bsc#981659)
+- high: constants: Add maintenance to set of known attributes (bsc#981659)
+- medium: scripts: no-quorum-policy=ignore is deprecated (bsc#981056)
+- low: history: fall back to any log file in report root
+- medium: history: Report better error when history user is not sudoer
(bsc#980924)
+- high: history: Store live report in per-user directory (bsc#980924)
+- medium: logparser: Fix use-before-declaration error in logparser
+- low: utils: Clearer error if permission denied when locking (bsc#980924)
+- medium: logparser: Handle read-only access to metadata cache (bsc#980924)
+- doc: Add @steenzout to AUTHORS
+- fix issue #144 by comparing output line by line (#146)
+- fixed version number (#142)
+-
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2016-08-09 22:15:54
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2016-08-03
11:44:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-08-09
22:16:00.0 +0200
@@ -1,0 +2,6 @@
+Tue Aug 09 11:54:54 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.2.0+git.1470743271.64d1a40:
+ * medium: constants: Add missing alerts constants (#150) (bsc#992789)
+
+---
Old:
crmsh-2.2.0+git.1469918297.1b801f6.tar.bz2
New:
crmsh-2.2.0+git.1470743271.64d1a40.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.w3SlGz/_old 2016-08-09 22:16:01.0 +0200
+++ /var/tmp/diff_new_pack.w3SlGz/_new 2016-08-09 22:16:01.0 +0200
@@ -32,13 +32,13 @@
%{!?python_sitelib: %define python_sitelib %(python -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define version_unconverted 2.2.0+git.1469918297.1b801f6
+%define version_unconverted 2.2.0+git.1470743271.64d1a40
Name: crmsh
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:2.2.0+git.1469918297.1b801f6
+Version:2.2.0+git.1470743271.64d1a40
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.w3SlGz/_old 2016-08-09 22:16:02.0 +0200
+++ /var/tmp/diff_new_pack.w3SlGz/_new 2016-08-09 22:16:02.0 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 1b801f6bca54aa91ca066a057e3b0003715995e7
\ No newline at end of file
+ 64d1a40b8ed79e17973af5d9159eca3e703cf8e8
\ No newline at end of file
++ crmsh-2.2.0+git.1469918297.1b801f6.tar.bz2 ->
crmsh-2.2.0+git.1470743271.64d1a40.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1469918297.1b801f6/crmsh/constants.py
new/crmsh-2.2.0+git.1470743271.64d1a40/crmsh/constants.py
--- old/crmsh-2.2.0+git.1469918297.1b801f6/crmsh/constants.py 2016-07-31
00:40:44.0 +0200
+++ new/crmsh-2.2.0+git.1470743271.64d1a40/crmsh/constants.py 2016-08-09
13:54:54.0 +0200
@@ -30,6 +30,7 @@
"fencing_topology": "element",
"fencing-topology": "element",
"tag": "element",
+"alert": "element",
"monitor": "element",
"params": "subelement",
"meta": "subelement",
@@ -38,6 +39,7 @@
"operations": "subelement",
"op": "subelement",
"rule": "subelement",
+"to": "subelement",
"inf": "value",
"INFINITY": "value",
"and": "op",
@@ -94,7 +96,8 @@
"acl_user": "user",
"acl_role": "role",
"fencing-topology": "fencing_topology",
-"tag": "tag"
+"tag": "tag",
+"alert": "alert",
}
container_tags = ("group", "clone", "ms", "master")
clonems_tags = ("clone", "ms", "master")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1469918297.1b801f6/test/testcases/newfeatures
new/crmsh-2.2.0+git.1470743271.64d1a40/test/testcases/newfeatures
--- old/crmsh-2.2.0+git.1469918297.1b801f6/test/testcases/newfeatures
2016-07-31 00:40:44.0 +0200
+++ new/crmsh-2.2.0+git.1470743271.64d1a40/test/testcases/newfeatures
2016-08-09 13:54:54.0 +0200
@@ -21,6 +21,12 @@
location l1 { p0 p1 p2 } inf: node1
primitive node1 Dummy
tag ones l1 p1
+alert notify_9 /usr/share/pacemaker/alerts/alert_snmp.sh \
+attributes \
+trap_add_hires_timestamp_oid="false" \
+trap_node_states="non-trap" \
+trap_resource_tasks="start,stop,monitor,promote,demote" \
+to "192.168.40.9"
show tag:ones and type:location
show tag:ones and p1
show
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1469918297.1b801f6/test/testcases/newfeatures.exp
new/crmsh-2.2.0+git.1470743271.64d1a40/test/testcases/newfeatures.exp
--- old/crmsh-2.2.0+git.1469918297.1b801f6/test/testcases/newfeatures.exp
2016-07-31 00:40:44.0 +0200
+++ new/crmsh-2.2.0+git.1470743271.64d1a40/test/testcases/newfeatures.exp
2016-08-09 13:54:54.0 +0200
@@ -15,6 +15,7 @@
.INP: location l1 { p0 p1 p2 } inf: node1
.INP: primitive node1 Dummy
.INP: tag ones l1 p1
+.INP: alert notify_9 /usr/share/pacemaker/alerts/alert_snmp.sh
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2016-08-03 11:44:38
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2016-06-14
23:06:54.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-08-03
11:44:59.0 +0200
@@ -1,0 +2,10 @@
+Sat Jul 30 22:40:45 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.2.0+git.1469918297.1b801f6:
+ * high: hb_report: Skip lines without timestamps in log correctly
(bsc#989810)
+ * high: hb_report: Don't collect logs from journalctl if -M is set
(bsc#990025)
+ * high: parse: Use original _TARGET_RE
+ * low: Fix a setting example of the alert to become the error
+ * low: scripts: Fix use of non-relative import for ra
+
+---
Old:
crmsh-2.2.0+git.1464769043.9e4df55.tar.bz2
New:
crmsh-2.2.0+git.1469918297.1b801f6.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.qd1PBD/_old 2016-08-03 11:45:00.0 +0200
+++ /var/tmp/diff_new_pack.qd1PBD/_new 2016-08-03 11:45:00.0 +0200
@@ -32,13 +32,13 @@
%{!?python_sitelib: %define python_sitelib %(python -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define version_unconverted 2.2.0+git.1464769043.9e4df55
+%define version_unconverted 2.2.0+git.1469918297.1b801f6
Name: crmsh
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:2.2.0+git.1464769043.9e4df55
+Version:2.2.0+git.1469918297.1b801f6
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.qd1PBD/_old 2016-08-03 11:45:00.0 +0200
+++ /var/tmp/diff_new_pack.qd1PBD/_new 2016-08-03 11:45:00.0 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 9e4df55617a3255398064d789af1b5180d0de736
\ No newline at end of file
+ 1b801f6bca54aa91ca066a057e3b0003715995e7
\ No newline at end of file
++ crmsh-2.2.0+git.1464769043.9e4df55.tar.bz2 ->
crmsh-2.2.0+git.1469918297.1b801f6.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1464769043.9e4df55/crmsh/parse.py
new/crmsh-2.2.0+git.1469918297.1b801f6/crmsh/parse.py
--- old/crmsh-2.2.0+git.1464769043.9e4df55/crmsh/parse.py 2016-06-01
10:22:40.0 +0200
+++ new/crmsh-2.2.0+git.1469918297.1b801f6/crmsh/parse.py 2016-07-31
00:40:44.0 +0200
@@ -40,7 +40,7 @@
_RA_TYPE_RE = re.compile(r'[a-z0-9_:-]+$', re.IGNORECASE)
_TAG_RE = re.compile(r"([a-zA-Z_][^\s:]*):?$")
_ROLE2_RE = re.compile(r"role=(.+)$", re.IGNORECASE)
-_TARGET_RE = re.compile(r'([\w=-]+):$')
+_TARGET_RE = re.compile(r'([^:]+):$')
_TARGET_ATTR_RE = re.compile(r'attr:([\w-]+)=([\w-]+)$', re.IGNORECASE)
TERMINATORS = ('params', 'meta', 'utilization', 'operations', 'op', 'rule',
'attributes')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1464769043.9e4df55/crmsh/scripts.py
new/crmsh-2.2.0+git.1469918297.1b801f6/crmsh/scripts.py
--- old/crmsh-2.2.0+git.1464769043.9e4df55/crmsh/scripts.py 2016-06-01
10:22:40.0 +0200
+++ new/crmsh-2.2.0+git.1469918297.1b801f6/crmsh/scripts.py 2016-07-31
00:40:44.0 +0200
@@ -691,7 +691,7 @@
def _process_agent_include(script, include):
-import ra
+from . import ra
agent = include['agent']
info = ra.get_ra(agent)
meta = info.meta()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1464769043.9e4df55/doc/crm.8.adoc
new/crmsh-2.2.0+git.1469918297.1b801f6/doc/crm.8.adoc
--- old/crmsh-2.2.0+git.1464769043.9e4df55/doc/crm.8.adoc 2016-06-01
10:22:40.0 +0200
+++ new/crmsh-2.2.0+git.1469918297.1b801f6/doc/crm.8.adoc 2016-07-31
00:40:44.0 +0200
@@ -2688,8 +2688,8 @@
to /var/log/cluster-alerts.log
alert alert-2 /srv/pacemaker/example_alert.sh \
-to { /var/log/cluster-alerts.log } \
-meta timeout=60s
+meta timeout=60s \
+to { /var/log/cluster-alerts.log }
...
[[cmdhelp_configure_cib,CIB shadow management]]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1464769043.9e4df55/doc/website-v1/crm.conf
new/crmsh-2.2.0+git.1469918297.1b801f6/doc/website-v1/crm.conf
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2016-06-14 23:06:53
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2016-05-23
16:40:43.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-06-14
23:06:54.0 +0200
@@ -1,0 +2,19 @@
+Wed Jun 01 08:22:41 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.2.0+git.1464769043.9e4df55:
+ * medium: tmpfiles: Create temporary directory if non-existing (bsc#981583)
+
+---
+Thu May 26 04:40:28 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.2.0+git.1464237560.fd9e583:
+ + high: constants: Add maintenance to set of known attributes (bsc#981659)
+ + medium: xmlutil: reduce unknown attribute to warning (bsc#981659)
+
+---
+Wed May 25 09:20:57 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.2.0+git.1464167894.621fe00:
+ + medium: scripts: no-quorum-policy=ignore is deprecated (bsc#981056)
+
+---
Old:
crmsh-2.2.0+git.1463777827.9b402a8.tar.bz2
New:
crmsh-2.2.0+git.1464769043.9e4df55.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.HEPd8d/_old 2016-06-14 23:06:55.0 +0200
+++ /var/tmp/diff_new_pack.HEPd8d/_new 2016-06-14 23:06:55.0 +0200
@@ -32,13 +32,13 @@
%{!?python_sitelib: %define python_sitelib %(python -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define version_unconverted 2.2.0+git.1463777827.9b402a8
+%define version_unconverted 2.2.0+git.1464769043.9e4df55
Name: crmsh
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:2.2.0+git.1463777827.9b402a8
+Version:2.2.0+git.1464769043.9e4df55
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.HEPd8d/_old 2016-06-14 23:06:55.0 +0200
+++ /var/tmp/diff_new_pack.HEPd8d/_new 2016-06-14 23:06:55.0 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 9b402a8f9970f430a037dd0251ea88155d569ef4
\ No newline at end of file
+ 9e4df55617a3255398064d789af1b5180d0de736
\ No newline at end of file
++ crmsh-2.2.0+git.1463777827.9b402a8.tar.bz2 ->
crmsh-2.2.0+git.1464769043.9e4df55.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1463777827.9b402a8/crmsh/constants.py
new/crmsh-2.2.0+git.1464769043.9e4df55/crmsh/constants.py
--- old/crmsh-2.2.0+git.1463777827.9b402a8/crmsh/constants.py 2016-05-23
10:25:56.0 +0200
+++ new/crmsh-2.2.0+git.1464769043.9e4df55/crmsh/constants.py 2016-06-01
10:22:40.0 +0200
@@ -203,7 +203,7 @@
precious_attrs = ("id-ref",)
op_extra_attrs = ("interval",)
rsc_meta_attributes = (
-"allow-migrate", "is-managed", "interval-origin",
+"allow-migrate", "maintenance", "is-managed", "interval-origin",
"migration-threshold", "priority", "multiple-active",
"failure-timeout", "resource-stickiness", "target-role",
"restart-type", "description", "remote-node", "requires",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1463777827.9b402a8/crmsh/corosync.py
new/crmsh-2.2.0+git.1464769043.9e4df55/crmsh/corosync.py
--- old/crmsh-2.2.0+git.1463777827.9b402a8/crmsh/corosync.py2016-05-23
10:25:56.0 +0200
+++ new/crmsh-2.2.0+git.1464769043.9e4df55/crmsh/corosync.py2016-06-01
10:22:40.0 +0200
@@ -414,8 +414,7 @@
p.add('nodelist', make_section('nodelist.node', node_value))
num_nodes = p.count('nodelist.node')
-if num_nodes > 2:
-p.remove('quorum.two_node')
+p.set('quorum.two_node', '1' if num_nodes == 2 else '0')
f = open(conf(), 'w')
f.write(p.to_string())
@@ -445,8 +444,7 @@
if nth == -1:
return
-if p.count('nodelist.node') <= 2:
-p.set('quorum.two_node', '1')
+p.set('quorum.two_node', '1' if num_nodes == 2 else '0')
f = open(conf(), 'w')
f.write(p.to_string())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1463777827.9b402a8/crmsh/msg.py
new/crmsh-2.2.0+git.1464769043.9e4df55/crmsh/msg.py
---
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2016-05-23 16:40:23
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2016-05-17
17:15:03.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-05-23
16:40:43.0 +0200
@@ -1,0 +2,11 @@
+Mon May 23 08:25:56 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.2.0+git.1463777827.9b402a8:
+ + high: history: Store live report in per-user directory (bsc#980924)
+ + medium: logparser: Handle read-only access to metadata cache (bsc#980924)
+ + medium: logparser: Fix use-before-declaration error in logparser
+ + medium: history: Report better error when history user is not sudoer
(bsc#980924)
+ + low: utils: Clearer error if permission denied when locking (bsc#980924)
+ + low: history: fall back to any log file in report root
+
+---
Old:
crmsh-2.2.0+git.1462967444.169c554.tar.bz2
New:
crmsh-2.2.0+git.1463777827.9b402a8.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.QN4DjC/_old 2016-05-23 16:40:46.0 +0200
+++ /var/tmp/diff_new_pack.QN4DjC/_new 2016-05-23 16:40:46.0 +0200
@@ -32,13 +32,13 @@
%{!?python_sitelib: %define python_sitelib %(python -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define version_unconverted 2.2.0+git.1462967444.169c554
+%define version_unconverted 2.2.0+git.1463777827.9b402a8
Name: crmsh
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:2.2.0+git.1462967444.169c554
+Version:2.2.0+git.1463777827.9b402a8
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
@@ -170,6 +170,10 @@
%install
make DESTDIR=%{buildroot} docdir=%{crmsh_docdir} install
install -Dm0644 contrib/bash_completion.sh
%{buildroot}%{_sysconfdir}/bash_completion.d/crm.sh
+if [ -f %{buildroot}%{_bindir}/crm ]; then
+ install -Dm0755 %{buildroot}%{_bindir}/crm %{buildroot}%{_sbindir}/crm
+ rm %{buildroot}%{_bindir}/crm
+fi
%if 0%{?suse_version}
%fdupes %{buildroot}
%endif
++ _servicedata ++
--- /var/tmp/diff_new_pack.QN4DjC/_old 2016-05-23 16:40:46.0 +0200
+++ /var/tmp/diff_new_pack.QN4DjC/_new 2016-05-23 16:40:46.0 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 169c5549accf42af8b89f6cc4d574c6c219768b1
\ No newline at end of file
+ 9b402a8f9970f430a037dd0251ea88155d569ef4
\ No newline at end of file
++ crmsh-2.2.0+git.1462967444.169c554.tar.bz2 ->
crmsh-2.2.0+git.1463777827.9b402a8.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1462967444.169c554/.travis.yml
new/crmsh-2.2.0+git.1463777827.9b402a8/.travis.yml
--- old/crmsh-2.2.0+git.1462967444.169c554/.travis.yml 2016-05-12
10:40:53.0 +0200
+++ new/crmsh-2.2.0+git.1463777827.9b402a8/.travis.yml 2016-05-23
10:25:56.0 +0200
@@ -2,11 +2,15 @@
sudo: false
language: python
python:
- - "2.6"
- - "2.7"
+ - 2.6
+ - 2.7
+
install:
- - "pip install -r requirements.txt"
-script: ./test/run --with-coverage
+ - pip install tox-travis
+
+script:
+ - tox
+
notifications:
irc:
channels:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1462967444.169c554/AUTHORS
new/crmsh-2.2.0+git.1463777827.9b402a8/AUTHORS
--- old/crmsh-2.2.0+git.1462967444.169c554/AUTHORS 2016-05-12
10:40:53.0 +0200
+++ new/crmsh-2.2.0+git.1463777827.9b402a8/AUTHORS 2016-05-23
10:25:56.0 +0200
@@ -25,7 +25,7 @@
Motaharu Kobu
NAKAHIRA Kazutomo
nozawat
- renayama19661014
+ Pedro Salgado
Richard B Winters
seabres
Tim Serong
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1462967444.169c554/Makefile.am
new/crmsh-2.2.0+git.1463777827.9b402a8/Makefile.am
--- old/crmsh-2.2.0+git.1462967444.169c554/Makefile.am 2016-05-12
10:40:53.0 +0200
+++ new/crmsh-2.2.0+git.1463777827.9b402a8/Makefile.am
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2016-05-17 17:15:00
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2016-05-05
12:12:22.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-05-17
17:15:03.0 +0200
@@ -1,0 +2,10 @@
+Thu May 12 08:40:54 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.2.0+git.1462967444.169c554:
+ + high: parse: Support for event-driven alerts (fate#320855) (#136)
+ + high: utils: Avoid deadlock if DC changes during idle wait (bsc#978480)
+ + medium: ui_resource: Add force argument to resource cleanup (bsc#979420)
+ + medium: ui_resource: Show utilization in output from crm resource scores
+ + high: ui_resource: Improved resource move/clear/locate commands
+
+---
Old:
crmsh-2.2.0+git.1462285059.d79cd0d.tar.bz2
New:
crmsh-2.2.0+git.1462967444.169c554.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.qvK0Pp/_old 2016-05-17 17:15:04.0 +0200
+++ /var/tmp/diff_new_pack.qvK0Pp/_new 2016-05-17 17:15:04.0 +0200
@@ -32,13 +32,13 @@
%{!?python_sitelib: %define python_sitelib %(python -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define version_unconverted 2.2.0+git.1462285059.d79cd0d
+%define version_unconverted 2.2.0+git.1462967444.169c554
Name: crmsh
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:2.2.0+git.1462285059.d79cd0d
+Version:2.2.0+git.1462967444.169c554
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.qvK0Pp/_old 2016-05-17 17:15:04.0 +0200
+++ /var/tmp/diff_new_pack.qvK0Pp/_new 2016-05-17 17:15:04.0 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- d79cd0db97b99ccb6d4dbbe9797917c18a4982aa
\ No newline at end of file
+ 169c5549accf42af8b89f6cc4d574c6c219768b1
\ No newline at end of file
++ crmsh-2.2.0+git.1462285059.d79cd0d.tar.bz2 ->
crmsh-2.2.0+git.1462967444.169c554.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1462285059.d79cd0d/.gitignore
new/crmsh-2.2.0+git.1462967444.169c554/.gitignore
--- old/crmsh-2.2.0+git.1462285059.d79cd0d/.gitignore 2016-05-03
16:17:39.0 +0200
+++ new/crmsh-2.2.0+git.1462967444.169c554/.gitignore 1970-01-01
01:00:00.0 +0100
@@ -1,19 +0,0 @@
-*.pyc
-*~
-#*.*#
-.#*
-doc/website-v1/gen
-Makefile.in
-autom4te.cache
-patches/*
-
-# Tool specific files
-.README.md.html
-.*.*~
-.project
-.settings
-.pydevproject
-
-contrib/build/
-contrib/dist/
-contrib/pygments_crmsh_lexers.egg-info/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1462285059.d79cd0d/.hgignore
new/crmsh-2.2.0+git.1462967444.169c554/.hgignore
--- old/crmsh-2.2.0+git.1462285059.d79cd0d/.hgignore2016-05-03
16:17:39.0 +0200
+++ new/crmsh-2.2.0+git.1462967444.169c554/.hgignore1970-01-01
01:00:00.0 +0100
@@ -1,7 +0,0 @@
-syntax: glob
-
-*.pyc
-*~
-#*.*#
-doc/gen
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1462285059.d79cd0d/Makefile.am
new/crmsh-2.2.0+git.1462967444.169c554/Makefile.am
--- old/crmsh-2.2.0+git.1462285059.d79cd0d/Makefile.am 2016-05-03
16:17:39.0 +0200
+++ new/crmsh-2.2.0+git.1462967444.169c554/Makefile.am 2016-05-12
10:40:53.0 +0200
@@ -73,11 +73,11 @@
install-exec-local:
-mkdir -p $(DESTDIR)$(pkgpythondir)
$(PYTHON) $(srcdir)/setup.py install \
- --root $(DESTDIR) \
+ --root $(DESTDIR)/// \
$(python_prefix) \
--record $(DESTDIR)$(pkgpythondir)/install_files.txt \
--verbose
- $(INSTALL) -d -m 770 $(DESTDIR)/$(CRM_CACHE_DIR)
+ $(INSTALL) -d -m 770 $(DESTDIR)$(CRM_CACHE_DIR)
uninstall-local:
cat $(DESTDIR)$(pkgpythondir)/install_files.txt | xargs rm -rf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1462285059.d79cd0d/crmsh/cibconfig.py
new/crmsh-2.2.0+git.1462967444.169c554/crmsh/cibconfig.py
--- old/crmsh-2.2.0+git.1462285059.d79cd0d/crmsh/cibconfig.py 2016-05-03
16:17:39.0 +0200
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2016-05-05 12:12:21
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2016-04-28
16:59:01.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-05-05
12:12:22.0 +0200
@@ -1,0 +2,10 @@
+Tue May 03 14:19:08 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.2.0+git.1462285059.d79cd0d:
+ + high: ui_root: Add crm verify command
+ + medium: hb_report: Fix broken -S option (#137)
+ + low: hb_report: Fix spurious error on missing events.txt
+ + low: scripts: Note SBD recommendation in vmware script (fate#318320)
+ + low: scripts: Note SBD recommendation in libvirt script (fate#318320)
+
+---
@@ -69 +79 @@
- + high: history: Faster log parsing (bsc#920278)
+ + high: history: Faster log parsing (bsc#970278)
Old:
crmsh-2.2.0+git.1461246131.bf3c265.tar.bz2
New:
crmsh-2.2.0+git.1462285059.d79cd0d.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.TmGExt/_old 2016-05-05 12:12:23.0 +0200
+++ /var/tmp/diff_new_pack.TmGExt/_new 2016-05-05 12:12:23.0 +0200
@@ -32,13 +32,13 @@
%{!?python_sitelib: %define python_sitelib %(python -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define version_unconverted 2.2.0+git.1461246131.bf3c265
+%define version_unconverted 2.2.0+git.1462285059.d79cd0d
Name: crmsh
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:2.2.0+git.1461246131.bf3c265
+Version:2.2.0+git.1462285059.d79cd0d
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.TmGExt/_old 2016-05-05 12:12:23.0 +0200
+++ /var/tmp/diff_new_pack.TmGExt/_new 2016-05-05 12:12:23.0 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- bf3c265508ce63bf1eb9c873534c29cfa488420d
\ No newline at end of file
+ d79cd0db97b99ccb6d4dbbe9797917c18a4982aa
\ No newline at end of file
++ crmsh-2.2.0+git.1461246131.bf3c265.tar.bz2 ->
crmsh-2.2.0+git.1462285059.d79cd0d.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1461246131.bf3c265/.gitignore
new/crmsh-2.2.0+git.1462285059.d79cd0d/.gitignore
--- old/crmsh-2.2.0+git.1461246131.bf3c265/.gitignore 1970-01-01
01:00:00.0 +0100
+++ new/crmsh-2.2.0+git.1462285059.d79cd0d/.gitignore 2016-05-03
16:17:39.0 +0200
@@ -0,0 +1,19 @@
+*.pyc
+*~
+#*.*#
+.#*
+doc/website-v1/gen
+Makefile.in
+autom4te.cache
+patches/*
+
+# Tool specific files
+.README.md.html
+.*.*~
+.project
+.settings
+.pydevproject
+
+contrib/build/
+contrib/dist/
+contrib/pygments_crmsh_lexers.egg-info/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1461246131.bf3c265/.hgignore
new/crmsh-2.2.0+git.1462285059.d79cd0d/.hgignore
--- old/crmsh-2.2.0+git.1461246131.bf3c265/.hgignore1970-01-01
01:00:00.0 +0100
+++ new/crmsh-2.2.0+git.1462285059.d79cd0d/.hgignore2016-05-03
16:17:39.0 +0200
@@ -0,0 +1,7 @@
+syntax: glob
+
+*.pyc
+*~
+#*.*#
+doc/gen
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1461246131.bf3c265/README.md
new/crmsh-2.2.0+git.1462285059.d79cd0d/README.md
--- old/crmsh-2.2.0+git.1461246131.bf3c265/README.md2016-04-21
15:46:53.0 +0200
+++ new/crmsh-2.2.0+git.1462285059.d79cd0d/README.md2016-05-03
16:17:39.0 +0200
@@ -1,6 +1,7 @@
# crmsh
[](https://travis-ci.org/ClusterLabs/crmsh)
+[](https://landscape.io/github/ClusterLabs/crmsh/master)
## Introduction
@@ -21,7 +22,13 @@
## Installation
-Autoconf is used to take care of platform dependent locations. It is mainly
inherited from the Pacemaker source.
+The GNU Autotools suite is used to configure the OCF root directory,
+the Asciidoc tool which is used to generate documentation and the
+default daemon user (usually hacluster).
+
+It then calls the python setuptools setup.py to actually process the
+Python module sources and install into the Python system site-packages
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2016-04-28 16:55:33
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2016-04-01
13:03:11.0 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-04-28
16:59:01.0 +0200
@@ -1,0 +2,35 @@
+Thu Apr 21 13:46:53 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.2.0+git.1461246131.bf3c265:
+ + medium: scripts: Add vmware to data manifest (fate#318320)
+ + medium: ui_node: Fix crash in node fence command (bsc#974902)
+ + low: scripts: Preserve formatting in description for vmware wizard
+ + low: scripts: Better description for sbd
+
+---
+Tue Apr 19 16:46:59 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.2.0+git.1461083981.dab79a4:
+ + high: scripts: VMware fencing using vCenter (fate#318320)
+
+---
+Tue Apr 19 07:53:28 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.2.0+git.1461051741.724349d:
+ + low: cibconfig: Don't mix up CLI name with XML tag
+ + low: constants: Add missing reload operation to parser
+ + low: corosync: Recycle node IDs when possible
+ + low: parse: Don't validate operation name in parser (bsc#975357)
+ + low: scripts: Only print debug output locally unless there were remote
actions
+ + low: scripts: Fix watchdog test in sbd-device (fate#318320)
+ + low: scripts: Shouldn't set -e here (fate#318320)
+
+- Remove bug-974902_crm-node-fence.patch
+
+---
+Fri Apr 15 13:22:44 UTC 2016 - y...@suse.com
+
+- medium: ui_node: Fix "crm node fence" (bsc#974902)
+ - bug-974902_crm-node-fence.patch
+
+---
Old:
crmsh-2.2.0+git.1459359704.8d9b910.tar.bz2
New:
crmsh-2.2.0+git.1461246131.bf3c265.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.6Qf33r/_old 2016-04-28 16:59:03.0 +0200
+++ /var/tmp/diff_new_pack.6Qf33r/_new 2016-04-28 16:59:03.0 +0200
@@ -32,13 +32,13 @@
%{!?python_sitelib: %define python_sitelib %(python -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define version_unconverted 2.2.0+git.1459359704.8d9b910
+%define version_unconverted 2.2.0+git.1461246131.bf3c265
Name: crmsh
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:2.2.0+git.1459359704.8d9b910
+Version:2.2.0+git.1461246131.bf3c265
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.6Qf33r/_old 2016-04-28 16:59:03.0 +0200
+++ /var/tmp/diff_new_pack.6Qf33r/_new 2016-04-28 16:59:03.0 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 8d9b910e4a11cf8f8148b5f97e35602bc71bde03
\ No newline at end of file
+ bf3c265508ce63bf1eb9c873534c29cfa488420d
\ No newline at end of file
++ crmsh-2.2.0+git.1459359704.8d9b910.tar.bz2 ->
crmsh-2.2.0+git.1461246131.bf3c265.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1459359704.8d9b910/contrib/git-hook-pre-commit
new/crmsh-2.2.0+git.1461246131.bf3c265/contrib/git-hook-pre-commit
--- old/crmsh-2.2.0+git.1459359704.8d9b910/contrib/git-hook-pre-commit
1970-01-01 01:00:00.0 +0100
+++ new/crmsh-2.2.0+git.1461246131.bf3c265/contrib/git-hook-pre-commit
2016-04-21 15:46:53.0 +0200
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments. The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+root="$(git rev-parse --show-toplevel)"
+[ -d "$root" ] || exit 1
+
+./update-data-manifest.sh
+git add ./data-manifest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1459359704.8d9b910/crmsh/cibconfig.py
new/crmsh-2.2.0+git.1461246131.bf3c265/crmsh/cibconfig.py
--- old/crmsh-2.2.0+git.1459359704.8d9b910/crmsh/cibconfig.py 2016-03-31
08:00:48.0 +0200
+++ new/crmsh-2.2.0+git.1461246131.bf3c265/crmsh/cibconfig.py 2016-04-21
15:46:53.0 +0200
@@ -437,7 +437,7 @@
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2016-04-01 13:03:00
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2016-03-26
15:24:49.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-04-01
13:03:11.0 +0200
@@ -1,0 +2,13 @@
+Thu Mar 31 06:00:48 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.2.0+git.1459359704.8d9b910:
+ + medium: scripts: Use os.uname() to find hostname (#128)
+ + low: logparser: Don't crash on nodes without logs
+ + low: history: Don't skip nodes without logs
+ + low: parser: ignore case for attr: prefix
+ + low: scripts: Need sudo if non-local call
+ + low: history: update the syslog format matching
+ + low: report: add information about booth
+ + low: report: if present, use the subsecond part from syslog timestamps
+
+---
Old:
crmsh-2.2.0+git.1458546035.5df0420.tar.bz2
New:
crmsh-2.2.0+git.1459359704.8d9b910.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.jwUre2/_old 2016-04-01 13:03:12.0 +0200
+++ /var/tmp/diff_new_pack.jwUre2/_new 2016-04-01 13:03:12.0 +0200
@@ -32,11 +32,13 @@
%{!?python_sitelib: %define python_sitelib %(python -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%define version_unconverted 2.2.0+git.1459359704.8d9b910
+
Name: crmsh
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:2.2.0+git.1458546035.5df0420
+Version:2.2.0+git.1459359704.8d9b910
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.jwUre2/_old 2016-04-01 13:03:12.0 +0200
+++ /var/tmp/diff_new_pack.jwUre2/_new 2016-04-01 13:03:12.0 +0200
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 5df0420c4bde1f550f5476c9540d5fc0a92105f1
\ No newline at end of file
+ 8d9b910e4a11cf8f8148b5f97e35602bc71bde03
\ No newline at end of file
++ crmsh-2.2.0+git.1458546035.5df0420.tar.bz2 ->
crmsh-2.2.0+git.1459359704.8d9b910.tar.bz2 ++
3406 lines of diff (skipped)
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2016-03-26 15:24:47
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2016-03-17
16:48:13.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-03-26
15:24:49.0 +0100
@@ -1,0 +2,16 @@
+Mon Mar 21 08:16:46 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.2.0+git.1458546035.5df0420:
+ + medium: scripts: SBD wizard which configures SBD itself (fate#318320)
+ + medium: main: Add -o|--opt to pass extra options for crmsh
+ + medium: hb_report: Add timeout to SSH connection (bsc#971690)
+ + low: command: handle stray regex characters in input
+ + low: scripts: Clean up various scripts
+
+---
+Wed Mar 16 17:03:21 UTC 2016 - bwiedem...@suse.com
+
+- Fix build-compare by only touching files with timestamps in the future
+ and by not including the rebuild counter in hb_report
+
+---
Old:
crmsh-2.2.0+git.1458042315.389d264.tar.bz2
New:
crmsh-2.2.0+git.1458546035.5df0420.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.ahnQih/_old 2016-03-26 15:24:50.0 +0100
+++ /var/tmp/diff_new_pack.ahnQih/_new 2016-03-26 15:24:50.0 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:2.2.0+git.1458042315.389d264
+Version:2.2.0+git.1458546035.5df0420
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
@@ -144,7 +144,7 @@
# This can result in files having been created in the future
# when building on machines in timezones 'behind' the one the
# commit occurred in - which seriously confuses 'make'
-find . -exec touch \{\} \;
+find . -mtime -0 -exec touch \{\} \;
%build
./autogen.sh
@@ -152,10 +152,10 @@
%{configure}\
--sysconfdir=%{_sysconfdir} \
--localstatedir=%{_var} \
---with-version=%{version}-%{release}\
+--with-version=%{version}\
--docdir=%{crmsh_docdir}
-make %{_smp_mflags} VERSION="%{version}-%{release}" sysconfdir=%{_sysconfdir}
localstatedir=%{_var}
+make %{_smp_mflags} VERSION="%{version}" sysconfdir=%{_sysconfdir}
localstatedir=%{_var}
%if 0%{?with_regression_tests}
./test/run --quiet
++ _servicedata ++
--- /var/tmp/diff_new_pack.ahnQih/_old 2016-03-26 15:24:50.0 +0100
+++ /var/tmp/diff_new_pack.ahnQih/_new 2016-03-26 15:24:50.0 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 389d264af0fe7c8bd8eb304e8afd0a02a0186cbc
\ No newline at end of file
+ 5df0420c4bde1f550f5476c9540d5fc0a92105f1
\ No newline at end of file
++ crmsh-2.2.0+git.1458042315.389d264.tar.bz2 ->
crmsh-2.2.0+git.1458546035.5df0420.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1458042315.389d264/crmsh/command.py
new/crmsh-2.2.0+git.1458546035.5df0420/crmsh/command.py
--- old/crmsh-2.2.0+git.1458042315.389d264/crmsh/command.py 2016-03-15
12:49:51.0 +0100
+++ new/crmsh-2.2.0+git.1458546035.5df0420/crmsh/command.py 2016-03-21
09:16:45.0 +0100
@@ -205,12 +205,15 @@
import re
def fuzzy_match(rx):
-matcher = re.compile(rx, re.I)
-matches = [c
- for m, c in items.iteritems()
- if matcher.match(m)]
-if len(matches) == 1:
-return matches[0]
+try:
+matcher = re.compile(rx, re.I)
+matches = [c
+ for m, c in items.iteritems()
+ if matcher.match(m)]
+if len(matches) == 1:
+return matches[0]
+except re.error as e:
+raise ValueError(e)
return None
# prefix match
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1458042315.389d264/crmsh/handles.py
new/crmsh-2.2.0+git.1458546035.5df0420/crmsh/handles.py
--- old/crmsh-2.2.0+git.1458042315.389d264/crmsh/handles.py 2016-03-15
12:49:51.0 +0100
+++ new/crmsh-2.2.0+git.1458546035.5df0420/crmsh/handles.py 2016-03-21
09:16:45.0 +0100
@@ -4,7 +4,7 @@
import re
-_head_re = re.compile(r'\{\{(\#|\^)?([A-Za-z0-9\#\$:_-]+)\}\}')
+headmatcher =
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2016-03-17 16:34:59
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2016-02-26
00:28:27.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-03-17
16:48:13.0 +0100
@@ -1,0 +2,24 @@
+Tue Mar 15 11:49:51 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.2.0+git.1458042315.389d264:
+ + high: history: Faster log parsing (bsc#920278)
+ + medium: ui_node: Use stonith_admin -F to fence remote nodes (bsc#967907)
+ + medium: crm_pssh: Fix live refresh of journalctl logs (bsc#970931)
+ + medium: hb_report: Use server attribute for remote nodes if set
(bsc#970819)
+ + medium: ui_node: Add crm node server command
+ + medium: scripts: Simplify SBD script (bsc#968076) (fate#318320)
+ + medium: scripts: inline scripts for call actions
+ + medium: scripts: Don't require sudo for root
+ + medium: scripts: Set sudo and full path for exportfs -v in nfs scripts
+ + medium: scripts: Add nfs-utils to list of packages for nfsserver
+ + low: history: use os.listdir to list history sessions
+ + low: scripts: Fix error in service action
+ + low: logtime: Improve performance of syslog_ts (bsc#970278)
+ + low: hb_report: Print covered time span at exit (bsc#970823)
+ + low: hb_report: Warn if generated report is empty (bsc#970823)
+ + low: log_patterns_118: Add captures to log patterns for tagging
(bsc#970278)
+ + low: ui_resource: alias show to get
+ + low: hb_report: Suggest user checks timeframe on empty logs (bsc#970823)
+ + low: logparser: Add cib info to __meta for hawk
+
+---
Old:
crmsh-2.2.0+git.1456299101.87fe3c9.tar.bz2
New:
crmsh-2.2.0+git.1458042315.389d264.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.Mrp0yC/_old 2016-03-17 16:48:14.0 +0100
+++ /var/tmp/diff_new_pack.Mrp0yC/_new 2016-03-17 16:48:14.0 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:2.2.0+git.1456299101.87fe3c9
+Version:2.2.0+git.1458042315.389d264
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.Mrp0yC/_old 2016-03-17 16:48:14.0 +0100
+++ /var/tmp/diff_new_pack.Mrp0yC/_new 2016-03-17 16:48:14.0 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 87fe3c9e0a7bf7ff8ed28d7bd116957326e9f02e
\ No newline at end of file
+ 389d264af0fe7c8bd8eb304e8afd0a02a0186cbc
\ No newline at end of file
++ crmsh-2.2.0+git.1456299101.87fe3c9.tar.bz2 ->
crmsh-2.2.0+git.1458042315.389d264.tar.bz2 ++
52496 lines of diff (skipped)
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2016-02-25 22:09:35
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2016-02-22
08:58:03.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-02-26
00:28:27.0 +0100
@@ -1,0 +2,8 @@
+Wed Feb 24 11:00:06 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.2.0+git.1456299101.87fe3c9:
+ + high: ui_configure: Fix commit force (#120)
+ + medium: config: make multiarch dependency a dynamic include (#119)
+ + low: ui_node: Less cryptic query when fencing node
+
+---
Old:
crmsh-2.2.0+git.1455627181.78fd949.tar.bz2
New:
crmsh-2.2.0+git.1456299101.87fe3c9.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.P8gk1d/_old 2016-02-26 00:28:28.0 +0100
+++ /var/tmp/diff_new_pack.P8gk1d/_new 2016-02-26 00:28:28.0 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:2.2.0+git.1455627181.78fd949
+Version:2.2.0+git.1456299101.87fe3c9
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.P8gk1d/_old 2016-02-26 00:28:28.0 +0100
+++ /var/tmp/diff_new_pack.P8gk1d/_new 2016-02-26 00:28:28.0 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 78fd94936f0edc2c9c040b72757aaed024621bc9
\ No newline at end of file
+ 87fe3c9e0a7bf7ff8ed28d7bd116957326e9f02e
\ No newline at end of file
++ crmsh-2.2.0+git.1455627181.78fd949.tar.bz2 ->
crmsh-2.2.0+git.1456299101.87fe3c9.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1455627181.78fd949/AUTHORS
new/crmsh-2.2.0+git.1456299101.87fe3c9/AUTHORS
--- old/crmsh-2.2.0+git.1455627181.78fd949/AUTHORS 2016-02-19
09:59:06.0 +0100
+++ new/crmsh-2.2.0+git.1456299101.87fe3c9/AUTHORS 2016-02-24
12:00:06.0 +0100
@@ -7,12 +7,14 @@
Andrew Beekhof
Borislav Borisov
Christian Seiler
+ Daniel Hoffend
Dejan Muhamedagic
Federica Teodori
Florian Haas
Goldwyn Rodrigues
Hideo Yamauchi
Holger Teutsch
+ Kai Kang
Kazunori INOUE
Keisuke MORI
Kristoffer Gronlund
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1455627181.78fd949/modules/config.py
new/crmsh-2.2.0+git.1456299101.87fe3c9/modules/config.py
--- old/crmsh-2.2.0+git.1455627181.78fd949/modules/config.py2016-02-19
09:59:06.0 +0100
+++ new/crmsh-2.2.0+git.1456299101.87fe3c9/modules/config.py2016-02-24
12:00:06.0 +0100
@@ -13,14 +13,31 @@
from . import userdir
+def configure_libdir():
+'''
+sysconfig is only available in 2.7 and above
+MULTIARCH is a debian specific configuration variable
+'''
+dirs = ('/usr/lib64', '/usr/libexec', '/usr/lib',
+'/usr/local/lib64', '/usr/local/libexec', '/usr/local/lib')
+try:
+import sysconfig
+multiarch = sysconfig.get_config_var('MULTIARCH')
+if multiarch:
+dirs += ('/usr/lib/%s' % multiarch,
+ '/usr/local/lib/%s' % multiarch)
+except ImportError:
+pass
+return dirs
+
+
_SYSTEMWIDE = '/etc/crm/crm.conf'
_PERUSER = os.getenv("CRM_CONFIG_FILE") or os.path.join(userdir.CONFIG_HOME,
'crm.conf')
_PATHLIST = {
'datadir': ('/usr/share', '/usr/local/share', '/opt'),
'cachedir': ('/var/cache', '/opt/cache'),
-'libdir': ('/usr/lib64', '/usr/libexec', '/usr/lib',
- '/usr/local/lib64', '/usr/local/libexec', '/usr/local/lib'),
+'libdir': configure_libdir(),
'varlib': ('/var/lib', '/opt/var/lib'),
'wwwdir': ('/srv/www', '/var/www')
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore'
commit crmsh for openSUSE:Factory
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2016-02-22 08:57:57
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
Package is "crmsh"
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2016-02-08
09:47:44.0 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-02-22
08:58:03.0 +0100
@@ -1,0 +2,8 @@
+Fri Feb 19 08:59:06 UTC 2016 - kgronl...@suse.com
+
+- Update to version 2.2.0+git.1455627181.78fd949:
+ + medium: ui_configure: Only wait for DC if resources were stopped (#117)
+ + medium: hb_report: Don't collect logs on non-nodes (bsc#959031)
+ + low: Fix title style vs. sentence style in cluster scripts (bsc#892108)
+
+---
Old:
crmsh-2.2.0+git.1454489864.2aa76e4.tar.bz2
New:
crmsh-2.2.0+git.1455627181.78fd949.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.mvBgND/_old 2016-02-22 08:58:04.0 +0100
+++ /var/tmp/diff_new_pack.mvBgND/_new 2016-02-22 08:58:04.0 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0+
Group: %{pkg_group}
-Version:2.2.0+git.1454489864.2aa76e4
+Version:2.2.0+git.1455627181.78fd949
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.mvBgND/_old 2016-02-22 08:58:04.0 +0100
+++ /var/tmp/diff_new_pack.mvBgND/_new 2016-02-22 08:58:04.0 +0100
@@ -1,4 +1,4 @@
git://github.com/ClusterLabs/crmsh.git
- 2aa76e41e1f21d6ffbfeb317b214183e4f1ea85b
\ No newline at end of file
+ 78fd94936f0edc2c9c040b72757aaed024621bc9
\ No newline at end of file
++ crmsh-2.2.0+git.1454489864.2aa76e4.tar.bz2 ->
crmsh-2.2.0+git.1455627181.78fd949.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-2.2.0+git.1454489864.2aa76e4/Makefile.am
new/crmsh-2.2.0+git.1455627181.78fd949/Makefile.am
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/Makefile.am 2016-02-04
08:00:04.0 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/Makefile.am 2016-02-19
09:59:06.0 +0100
@@ -78,7 +78,6 @@
--record $(DESTDIR)$(pkgpythondir)/install_files.txt \
--verbose
$(INSTALL) -d -m 770 $(DESTDIR)/$(CRM_CACHE_DIR)
- -rm -rf $(generated_docs) $(generated_mans)
uninstall-local:
cat $(DESTDIR)$(pkgpythondir)/install_files.txt | xargs rm -rf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/hb_report/hb_report.in
new/crmsh-2.2.0+git.1455627181.78fd949/hb_report/hb_report.in
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/hb_report/hb_report.in
2016-02-04 08:00:04.0 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/hb_report/hb_report.in
2016-02-19 09:59:06.0 +0100
@@ -533,7 +533,6 @@
TO_TIME=$TO_TIME
USER_NODES="$USER_NODES"
NODES="$NODES"
-MASTER_NODE="$MASTER_NODE"
HA_LOG=$HA_LOG
UNIQUE_MSG=$UNIQUE_MSG
SANITIZE="$SANITIZE"
@@ -555,9 +554,6 @@
is_node() {
test "$THIS_IS_NODE"
}
-is_master() {
- ! is_collector && test "$WE" = "$MASTER_NODE"
-}
start_slave_collector() {
local node=$1
@@ -1358,7 +1354,6 @@
THIS_IS_NODE=""
if ! is_collector; then
- MASTER_NODE=$WE
NODES=`getnodes`
debug "nodes: `echo $NODES`"
fi
@@ -1415,10 +1410,11 @@
# part 4: find the logs and cut out the segment for the period
#
-# if the master is also a node, getlog is going to be invoked
-# from the collector
-(is_master && is_node) ||
- getlog
+is_node && getlog
+
+#
+# Start slave collectors
+#
if ! is_collector; then
for node in $NODES; do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-2.2.0+git.1454489864.2aa76e4/modules/cibconfig.py
new/crmsh-2.2.0+git.1455627181.78fd949/modules/cibconfig.py
--- old/crmsh-2.2.0+git.1454489864.2aa76e4/modules/cibconfig.py 2016-02-04
08:00:04.0 +0100
+++ new/crmsh-2.2.0+git.1455627181.78fd949/modules/cibconfig.py 2016-02-19
09:59:06.0 +0100
@@ -23,7 +23,7 @@
from . import orderedset
from . import cibstatus
from . import crm_gv
-from .ra import get_ra, get_properties_list, get_pe_meta
+from .ra import get_ra, get_properties_list, get_pe_meta, get_properties_meta
from .msg import common_warn, common_err, common_debug, common_info, err_buf
from .msg import common_error,
