Attachment 1447751 Details for Bug 1476862 – proposed fix

[patch] proposed fix

0001-improve-pcs-quorum-device-add-usage-and-man-page.patch (text/plain), 4.37 KB, created by Tomas Jelinek on 2018-06-05 07:49:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Jelinek

Created: 2018-06-05 07:49:54 UTC

Size: 4.37 KB

patch

obsolete

>From 2016d9b3ce4a3e2c384936565d6edebf6fe87d4f Mon Sep 17 00:00:00 2001
>From: Tomas Jelinek <tojeline@redhat.com>
>Date: Tue, 5 Jun 2018 09:41:25 +0200
>Subject: [PATCH] improve 'pcs quorum device add' usage and man page
>
>---
> CHANGELOG.md |  2 ++
> pcs/pcs.8    |  6 +++++-
> pcs/usage.py | 18 ++++++++++++------
> 3 files changed, 19 insertions(+), 7 deletions(-)
>
>diff --git a/CHANGELOG.md b/CHANGELOG.md
>index 19871ed4..7d82b2a7 100644
>--- a/CHANGELOG.md
>+++ b/CHANGELOG.md
>@@ -19,6 +19,7 @@
>   ([rhbz#1581150])
> - Removing resources using web UI when the operation takes longer than expected
>   ([rhbz#1579911])
>+- Improve 'pcs quorum device add' usage and man page ([rhbz#1476862])
> 
> ### Changed
> - Watchdog devices are validated against a list provided by sbd
>@@ -27,6 +28,7 @@
> [ghpull#166]: https://github.com/ClusterLabs/pcs/pull/166
> [rhbz#1462248]: https://bugzilla.redhat.com/show_bug.cgi?id=1462248
> [rhbz#1475318]: https://bugzilla.redhat.com/show_bug.cgi?id=1475318
>+[rhbz#1476862]: https://bugzilla.redhat.com/show_bug.cgi?id=1476862
> [rhbz#1535967]: https://bugzilla.redhat.com/show_bug.cgi?id=1535967
> [rhbz#1566382]: https://bugzilla.redhat.com/show_bug.cgi?id=1566382
> [rhbz#1568353]: https://bugzilla.redhat.com/show_bug.cgi?id=1568353
>diff --git a/pcs/pcs.8 b/pcs/pcs.8
>index 18171643..496a19b3 100644
>--- a/pcs/pcs.8
>+++ b/pcs/pcs.8
>@@ -624,7 +624,11 @@ status
> Show quorum runtime status.
> .TP
> device add [<generic options>] model <device model> [<model options>] [heuristics <heuristics options>]
>-Add a quorum device to the cluster. Quorum device needs to be created first by "pcs qdevice setup" command. It is not possible to use more than one quorum device in a cluster simultaneously. Models and options are all documented in corosync\-qdevice(8) man page; for heuristics options check the quorum.device.heuristics subkey section, for model options check the quorum.device.<device model> subkey sections.
>+Add a quorum device to the cluster. Quorum device should be configured first with "pcs qdevice setup". It is not possible to use more than one quorum device in a cluster simultaneously.
>+.br
>+Currently the only supported model is 'net'. It requires model options 'algorithm' and 'host' to be specified. Options are documented in corosync\-qdevice(8) man page; generic options are 'sync_timeout' and 'timeout', for model net options check the quorum.device.net section, for heuristics options see the quorum.device.heuristics section. Pcs automatically creates and distributes TLS certificates and sets the 'tls' model option to the default value 'on'.
>+.br
>+Example: pcs quorum device add model net algorithm=lms host=qnetd.internal.example.com
> .TP
> device heuristics remove
> Remove all heuristics settings of the configured quorum device.
>diff --git a/pcs/usage.py b/pcs/usage.py
>index 19316add..5e0ac976 100644
>--- a/pcs/usage.py
>+++ b/pcs/usage.py
>@@ -1581,12 +1581,18 @@ Commands:
> 
>     device add [<generic options>] model <device model> [<model options>]
>             [heuristics <heuristics options>]
>-        Add a quorum device to the cluster. Quorum device needs to be created
>-        first by "pcs qdevice setup" command. It is not possible to use more
>-        than one quorum device in a cluster simultaneously. Models and options
>-        are all documented in corosync-qdevice(8) man page; for heuristics
>-        options check the quorum.device.heuristics subkey section, for model
>-        options check the quorum.device.<device model> subkey sections.
>+        Add a quorum device to the cluster. Quorum device should be configured
>+        first with "pcs qdevice setup". It is not possible to use more than one
>+        quorum device in a cluster simultaneously.
>+        Currently the only supported model is 'net'. It requires model options
>+        'algorithm' and 'host' to be specified. Options are documented in
>+        corosync-qdevice(8) man page; generic options are 'sync_timeout' and
>+        'timeout', for model net options check the quorum.device.net section,
>+        for heuristics options see the quorum.device.heuristics section. Pcs
>+        automatically creates and distributes TLS certificates and sets the
>+        'tls' model option to the default value 'on'.
>+        Example: pcs quorum device add model net algorithm=lms \\
>+            host=qnetd.internal.example.com
> 
>     device heuristics remove
>         Remove all heuristics settings of the configured quorum device.
>-- 
>2.11.0
>

Actions: View | Diff

Attachments on bug 1476862: 1447751