Resolves: rhbz#1990787 rhbz#2018969 rhbz#2019836 rhbz#2023752 rhbz#2012129

- Rebased to latest upstream sources (see CHANGELOG.md)
This commit is contained in:
Miroslav Lisik 2021-11-18 14:52:05 +01:00
parent 417d59d575
commit 9eae56d6dd
6 changed files with 80 additions and 47 deletions

1
.gitignore vendored
View File

@ -147,3 +147,4 @@
/pcs-0.11.1.alpha.1.33-e5970.tar.gz /pcs-0.11.1.alpha.1.33-e5970.tar.gz
/pcs-web-ui-0.1.10.tar.gz /pcs-web-ui-0.1.10.tar.gz
/pcs-web-ui-node-modules-0.1.10.tar.xz /pcs-web-ui-node-modules-0.1.10.tar.xz
/pcs-0.11.1.alpha.1.45-6743f.tar.gz

View File

@ -1,4 +1,4 @@
From 8dfec4b31078f1a645958aa0002a9f5467152dab Mon Sep 17 00:00:00 2001 From 259b7dad81d2fa41befa7d9c0a4d4e6dac0fac31 Mon Sep 17 00:00:00 2001
From: Ivan Devat <idevat@redhat.com> From: Ivan Devat <idevat@redhat.com>
Date: Tue, 20 Nov 2018 15:03:56 +0100 Date: Tue, 20 Nov 2018 15:03:56 +0100
Subject: [PATCH 1/2] do not support cluster setup with udp(u) transport in Subject: [PATCH 1/2] do not support cluster setup with udp(u) transport in
@ -10,10 +10,10 @@ Subject: [PATCH 1/2] do not support cluster setup with udp(u) transport in
2 files changed, 3 insertions(+) 2 files changed, 3 insertions(+)
diff --git a/pcs/pcs.8.in b/pcs/pcs.8.in diff --git a/pcs/pcs.8.in b/pcs/pcs.8.in
index 60d0ae71..cafa421c 100644 index 8174769b..21273013 100644
--- a/pcs/pcs.8.in --- a/pcs/pcs.8.in
+++ b/pcs/pcs.8.in +++ b/pcs/pcs.8.in
@@ -451,6 +451,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable @@ -449,6 +449,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable
Transports udp and udpu: Transports udp and udpu:
.br .br
@ -23,10 +23,10 @@ index 60d0ae71..cafa421c 100644
.br .br
Transport options are: ip_version, netmtu Transport options are: ip_version, netmtu
diff --git a/pcs/usage.py b/pcs/usage.py diff --git a/pcs/usage.py b/pcs/usage.py
index f55e817e..911e85bd 100644 index b2177f91..7528f773 100644
--- a/pcs/usage.py --- a/pcs/usage.py
+++ b/pcs/usage.py +++ b/pcs/usage.py
@@ -899,6 +899,7 @@ Commands: @@ -896,6 +896,7 @@ Commands:
hash=sha256. To disable encryption, set cipher=none and hash=none. hash=sha256. To disable encryption, set cipher=none and hash=none.
Transports udp and udpu: Transports udp and udpu:

View File

@ -1,43 +1,60 @@
From e42084ac211638354fc052c5a24631570a23fe71 Mon Sep 17 00:00:00 2001 From d68f7fd6036c508ab76b1ad6f97abbfce588a362 Mon Sep 17 00:00:00 2001
From: Miroslav Lisik <mlisik@redhat.com> From: Miroslav Lisik <mlisik@redhat.com>
Date: Tue, 2 Nov 2021 14:13:47 +0100 Date: Thu, 18 Nov 2021 13:32:06 +0100
Subject: [PATCH 2/2] fix changelog Subject: [PATCH 2/2] fix changelog
--- ---
CHANGELOG.md | 28 +++++++++------------------- CHANGELOG.md | 60 +++++++++++++++++++++++-----------------------------
1 file changed, 9 insertions(+), 19 deletions(-) 1 file changed, 26 insertions(+), 34 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9a633c3..860bd05b 100644 index a3a10db9..08395b5b 100644
--- a/CHANGELOG.md --- a/CHANGELOG.md
+++ b/CHANGELOG.md +++ b/CHANGELOG.md
@@ -3,15 +3,11 @@ @@ -2,13 +2,30 @@
## [Unreleased] ## [Unreleased]
+### Removed
+- Deprecated obsolete commands `pcs config import-cman` and `pcs config export
+ pcs-commands|pcs-commands-verbose` have been removed ([rhbz#1881064])
+- Unused and unmaintained pcsd urls: `/remote/config_backup`,
+ `/remote/node_available`, `/remote/resource_status`
+- Pcsd no longer provides data in format used by web UI in pcs 0.9.142 and older
+
### Added ### Added
+- Explicit confirmation is now required to prevent accidental destroying +- Explicit confirmation is now required to prevent accidental destroying
+ of the cluster with `pcs cluster destroy` ([rhbz#1283805]) + of the cluster with `pcs cluster destroy` ([rhbz#1283805])
- Add add/remove cli syntax for command `pcs stonith update-scsi-devices` - Add add/remove cli syntax for command `pcs stonith update-scsi-devices`
([rhbz#1992668]) ([rhbz#1992668])
- Command `pcs resource move` is fully supported ([rhbz#1990787])
- Support for OCF 1.1 resource and stonith agents ([rhbz#2018969])
### Changed
+- Pcs no longer depends on python3-distro package
+- 'pcs status xml' now prints cluster status in the new format provided by
+ Pacemaker 2.1 ([rhbz#1985981])
+- All errors, warning and progress related output is now printed to stderr
+ instead of stdout
+- Make roles `Promoted` and `Unpromoted` default ([rhbz#1885293])
+- Make auto-deleting constraint default for `pcs resource move` command
+ ([rhbz#1996062])
- Deprecation warnings use a "Deprecation Warning:" prefix instead of
"Warning:" on the command line
@@ -21,50 +38,25 @@
- Misleading error message from `pcs quorum unblock` when `wait_for_all=0`
([rhbz#1968088])
- -
-### Changed
-- Deprecation warnings use a "Deprecation Warning:" prefix instead of
- "Warning:" on the command line
-
-
### Fixed
- Do not unfence newly added devices on fenced cluster nodes ([rhbz#1991654])
- Fix displaying fencing levels with regular expression targets ([rhbz#1533090])
@@ -19,19 +15,6 @@
- Do not show warning that no stonith device was detected and stonith-enabled
is not false when a stonith device is in a group ([ghpull#370])
-[ghpull#370]: https://github.com/ClusterLabs/pcs/pull/370 -[ghpull#370]: https://github.com/ClusterLabs/pcs/pull/370
-[rhbz#1533090]: https://bugzilla.redhat.com/show_bug.cgi?id=1533090 -[rhbz#1533090]: https://bugzilla.redhat.com/show_bug.cgi?id=1533090
-[rhbz#1811072]: https://bugzilla.redhat.com/show_bug.cgi?id=1811072 -[rhbz#1811072]: https://bugzilla.redhat.com/show_bug.cgi?id=1811072
-[rhbz#1968088]: https://bugzilla.redhat.com/show_bug.cgi?id=1968088
-[rhbz#1990787]: https://bugzilla.redhat.com/show_bug.cgi?id=1990787
-[rhbz#1991654]: https://bugzilla.redhat.com/show_bug.cgi?id=1991654 -[rhbz#1991654]: https://bugzilla.redhat.com/show_bug.cgi?id=1991654
-[rhbz#1992668]: https://bugzilla.redhat.com/show_bug.cgi?id=1992668 -[rhbz#1992668]: https://bugzilla.redhat.com/show_bug.cgi?id=1992668
-[rhbz#2018969]: https://bugzilla.redhat.com/show_bug.cgi?id=2018969
- -
- -
-## [0.11.1.alpha.1] - 2021-08-26 -## [0.11.1.alpha.1] - 2021-08-26
@ -46,34 +63,45 @@ index f9a633c3..860bd05b 100644
-- Explicit confirmation is now required to prevent accidental destroying -- Explicit confirmation is now required to prevent accidental destroying
- of the cluster with `pcs cluster destroy` ([rhbz#1283805]) - of the cluster with `pcs cluster destroy` ([rhbz#1283805])
- -
### Changed -### Changed
- Pcs no longer depends on python3-distro package -- Pcs no longer depends on python3-distro package
- 'pcs status xml' now prints cluster status in the new format provided by -- 'pcs status xml' now prints cluster status in the new format provided by
@@ -41,6 +24,8 @@ - Pacemaker 2.1 ([rhbz#1985981])
- Make roles `Promoted` and `Unpromoted` default ([rhbz#1885293]) -- All errors, warning and progress related output is now printed to stderr
- Make auto-deleting constraint default for `pcs resource move` command - instead of stdout
([rhbz#1996062]) -- Make roles `Promoted` and `Unpromoted` default ([rhbz#1885293])
+- Deprecation warnings use a "Deprecation Warning:" prefix instead of -- Make auto-deleting constraint default for `pcs resource move` command
+ "Warning:" on the command line - ([rhbz#1996062])
-
### Removed -### Removed
- Deprecated obsolete commands `pcs config import-cman` and `pcs config export -- Deprecated obsolete commands `pcs config import-cman` and `pcs config export
@@ -54,10 +39,15 @@ - pcs-commands|pcs-commands-verbose` have been removed ([rhbz#1881064])
-- Unused and unmaintained pcsd urls: `/remote/config_backup`,
- `/remote/node_available`, `/remote/resource_status`
-- Pcsd no longer provides data in format used by web UI in pcs 0.9.142 and older
-
### Deprecated
- Legacy role names `Master` and `Slave` ([rhbz#1885293])
- Option `--master` is deprecated and has been replaced by option `--promoted` - Option `--master` is deprecated and has been replaced by option `--promoted`
([rhbz#1885293]) ([rhbz#1885293])
+
+[ghpull#370]: https://github.com/ClusterLabs/pcs/pull/370 +[ghpull#370]: https://github.com/ClusterLabs/pcs/pull/370
[rhbz#1283805]: https://bugzilla.redhat.com/show_bug.cgi?id=1283805 [rhbz#1283805]: https://bugzilla.redhat.com/show_bug.cgi?id=1283805
+[rhbz#1533090]: https://bugzilla.redhat.com/show_bug.cgi?id=1533090 +[rhbz#1533090]: https://bugzilla.redhat.com/show_bug.cgi?id=1533090
+[rhbz#1811072]: https://bugzilla.redhat.com/show_bug.cgi?id=1811072 +[rhbz#1811072]: https://bugzilla.redhat.com/show_bug.cgi?id=1811072
[rhbz#1881064]: https://bugzilla.redhat.com/show_bug.cgi?id=1881064 [rhbz#1881064]: https://bugzilla.redhat.com/show_bug.cgi?id=1881064
[rhbz#1885293]: https://bugzilla.redhat.com/show_bug.cgi?id=1885293 [rhbz#1885293]: https://bugzilla.redhat.com/show_bug.cgi?id=1885293
+[rhbz#1968088]: https://bugzilla.redhat.com/show_bug.cgi?id=1968088
[rhbz#1985981]: https://bugzilla.redhat.com/show_bug.cgi?id=1985981 [rhbz#1985981]: https://bugzilla.redhat.com/show_bug.cgi?id=1985981
+[rhbz#1990787]: https://bugzilla.redhat.com/show_bug.cgi?id=1990787
+[rhbz#1991654]: https://bugzilla.redhat.com/show_bug.cgi?id=1991654 +[rhbz#1991654]: https://bugzilla.redhat.com/show_bug.cgi?id=1991654
+[rhbz#1992668]: https://bugzilla.redhat.com/show_bug.cgi?id=1992668 +[rhbz#1992668]: https://bugzilla.redhat.com/show_bug.cgi?id=1992668
[rhbz#1996062]: https://bugzilla.redhat.com/show_bug.cgi?id=1996062 [rhbz#1996062]: https://bugzilla.redhat.com/show_bug.cgi?id=1996062
+[rhbz#2018969]: https://bugzilla.redhat.com/show_bug.cgi?id=2018969
## [0.10.10] - 2021-08-19
-- --
2.31.1 2.31.1

View File

@ -1,6 +1,6 @@
From 41e5767f13ce6ff082727a332fc7ce5245f91ac7 Mon Sep 17 00:00:00 2001 From f138def9b9d2559658aef8c074f3fb22325a6cdf Mon Sep 17 00:00:00 2001
From: Miroslav Lisik <mlisik@redhat.com> From: Miroslav Lisik <mlisik@redhat.com>
Date: Tue, 2 Nov 2021 13:13:47 +0100 Date: Thu, 18 Nov 2021 13:28:25 +0100
Subject: [PATCH] fix version Subject: [PATCH] fix version
--- ---
@ -9,19 +9,19 @@ Subject: [PATCH] fix version
2 files changed, 2 insertions(+), 2 deletions(-) 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.tarball-version b/.tarball-version diff --git a/.tarball-version b/.tarball-version
index 6ae7995..002e5eb 100644 index 8da758a..0b59c34 100644
--- a/.tarball-version --- a/.tarball-version
+++ b/.tarball-version +++ b/.tarball-version
@@ -1 +1 @@ @@ -1 +1 @@
-0.11.1.alpha.1.33-e5970 -0.11.1.alpha.1.45-6743f
+0.11.1.33-e5970 +0.11.1.45-6743f
diff --git a/.version b/.version diff --git a/.version b/.version
index 6ae7995..002e5eb 100644 index 8da758a..0b59c34 100644
--- a/.version --- a/.version
+++ b/.version +++ b/.version
@@ -1 +1 @@ @@ -1 +1 @@
-0.11.1.alpha.1.33-e5970 -0.11.1.alpha.1.45-6743f
+0.11.1.33-e5970 +0.11.1.45-6743f
-- --
2.31.1 2.31.1

View File

@ -1,6 +1,6 @@
Name: pcs Name: pcs
Version: 0.11.1 Version: 0.11.1
Release: 4%{?dist} Release: 5%{?dist}
# https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/ # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/
# https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
# GPLv2: pcs # GPLv2: pcs
@ -21,7 +21,7 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
%global version_or_commit %{version} %global version_or_commit %{version}
# %%global version_or_commit %%{version}.210-9862 # %%global version_or_commit %%{version}.210-9862
%global pcs_source_name %{name}-%{version_or_commit}.alpha.1.33-e5970 %global pcs_source_name %{name}-%{version_or_commit}.alpha.1.45-6743f
# ui_commit can be determined by hash, tag or branch # ui_commit can be determined by hash, tag or branch
%global ui_commit 0.1.10 %global ui_commit 0.1.10
@ -537,6 +537,10 @@ run_all_tests
%license pyagentx_LICENSE.txt %license pyagentx_LICENSE.txt
%changelog %changelog
* Thu Nov 18 2021 Miroslav Lisik <mlisik@redhat.com> - 0.11.1-5
- Rebased to latest upstream sources (see CHANGELOG.md)
- Resolves: rhbz#1990787 rhbz#2018969 rhbz#2019836 rhbz#2023752 rhbz#2012129
* Tue Nov 02 2021 Miroslav Lisik <mlisik@redhat.com> - 0.11.1-4 * Tue Nov 02 2021 Miroslav Lisik <mlisik@redhat.com> - 0.11.1-4
- Rebased to latest upstream sources (see CHANGELOG.md) - Rebased to latest upstream sources (see CHANGELOG.md)
- Updated pcs web ui - Updated pcs web ui

View File

@ -17,6 +17,6 @@ SHA512 (tornado-6.1.0.tar.gz) = bd161a1c30f40f983d608297bca113735cb4baad255de713
SHA512 (dacite-1.6.0.tar.gz) = 034255f095589d309fe5805413d8b148f430cd20a0de305b7954083b530d516da1d8f3f00ebb5264a8cfb77f2b2a76f1e2d863e78bd191f1d85021c5553815da SHA512 (dacite-1.6.0.tar.gz) = 034255f095589d309fe5805413d8b148f430cd20a0de305b7954083b530d516da1d8f3f00ebb5264a8cfb77f2b2a76f1e2d863e78bd191f1d85021c5553815da
SHA512 (webrick-1.7.0.gem) = 5f242b50300046fe7c22ecd1640a73e5815e05a72bedfebe6bc39c24c92bd61abdd180860de0d194c0eebbc640b507b6892de181d3b577c5372ace0ca6faf2a3 SHA512 (webrick-1.7.0.gem) = 5f242b50300046fe7c22ecd1640a73e5815e05a72bedfebe6bc39c24c92bd61abdd180860de0d194c0eebbc640b507b6892de181d3b577c5372ace0ca6faf2a3
SHA512 (rexml-3.2.5.gem) = 1e3838d4a5befa76137fb8fea6a20195490645aa2b1c5d14d1eeca6c093d7f64eb405f07fd07b00fcafa9606dc78f9f0a488012338f81414623feb6e8cb83931 SHA512 (rexml-3.2.5.gem) = 1e3838d4a5befa76137fb8fea6a20195490645aa2b1c5d14d1eeca6c093d7f64eb405f07fd07b00fcafa9606dc78f9f0a488012338f81414623feb6e8cb83931
SHA512 (pcs-0.11.1.alpha.1.33-e5970.tar.gz) = 14c20874c80dc8cbc16aabc8689f2df949facbdf4441c81f1dcb597cae734c212ff1472ce19666885a6b1cd481194dca9164e9600946d94b7933e70d313d78f8
SHA512 (pcs-web-ui-0.1.10.tar.gz) = af6f4338cdf82877f5ba66ce81c0e9c78613227c85e4e5fbd2f5f0518765e7ddaa3b6138b7d2c95605557e9e9a0f9ef947b6cff3e5023ada6ec4d8f7869b507f SHA512 (pcs-web-ui-0.1.10.tar.gz) = af6f4338cdf82877f5ba66ce81c0e9c78613227c85e4e5fbd2f5f0518765e7ddaa3b6138b7d2c95605557e9e9a0f9ef947b6cff3e5023ada6ec4d8f7869b507f
SHA512 (pcs-web-ui-node-modules-0.1.10.tar.xz) = d27257c2121c33fd3419bbb261d5e15aa35cc3e89e29a5e46b54dc196849cb20dab2503a8f7158df68f08187c7c5caa07ca07e794676e94cad02086de3571bd7 SHA512 (pcs-web-ui-node-modules-0.1.10.tar.xz) = d27257c2121c33fd3419bbb261d5e15aa35cc3e89e29a5e46b54dc196849cb20dab2503a8f7158df68f08187c7c5caa07ca07e794676e94cad02086de3571bd7
SHA512 (pcs-0.11.1.alpha.1.45-6743f.tar.gz) = e80b57b3dda0f89317202aff5fc14b7aaf9d2dafbb5a9ec604c193de0886e9076d53411c9ed81bf5baec3910e0b2d53d20ac2b1a61a87653c262940fe701d7bc