Skip to content

Commit

Permalink
make pcs resource safe-disable documentation clearer
Browse files Browse the repository at this point in the history
  • Loading branch information
tomjelinek committed May 22, 2023
1 parent af34e61 commit 3e479bd
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
`pcs config checkpoint diff` command ([rhbz#2175881])
- Fix `pcs stonith update-scsi-devices` command which was broken since
Pacemaker-2.1.5-rc1 ([rhbz#2177996])
- Make `pcs resource disable --simulate --brief` documentation clearer
([rhbz#2109852])

### Changed
- Commands for displaying cluster configuration have been slightly updated:
Expand All @@ -41,6 +43,7 @@
[ghpull#648]: https://github.com/ClusterLabs/pcs/pull/648
[rhbz#1423473]: https://bugzilla.redhat.com/show_bug.cgi?id=1423473
[rhbz#1860626]: https://bugzilla.redhat.com/show_bug.cgi?id=1860626
[rhbz#2109852]: https://bugzilla.redhat.com/show_bug.cgi?id=2109852
[rhbz#2163914]: https://bugzilla.redhat.com/show_bug.cgi?id=2163914
[rhbz#2163953]: https://bugzilla.redhat.com/show_bug.cgi?id=2163953
[rhbz#2168155]: https://bugzilla.redhat.com/show_bug.cgi?id=2168155
Expand Down
4 changes: 2 additions & 2 deletions pcs/pcs.8.in
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ If \fB\-\-safe\fR is specified, no changes to the cluster configuration will be
.br
If \fB\-\-no\-strict\fR is specified, no changes to the cluster configuration will be made if other than specified resources would get stopped or demoted. Moving resources between nodes is allowed.
.br
If \fB\-\-simulate\fR is specified, no changes to the cluster configuration will be made and the effect of the changes will be printed instead. If \fB\-\-brief\fR is also specified, only a list of affected resources will be printed.
If \fB\-\-simulate\fR is specified, no changes to the cluster configuration will be made and the effect of the changes will be printed instead. If \fB\-\-brief\fR is also specified, only a list of affected resources not specified in the command will be printed.
.br
If \fB\-\-wait\fR is specified, pcs will wait up to 'n' seconds for the resources to stop and then return 0 if the resources are stopped or 1 if the resources have not stopped. If 'n' is not specified it defaults to 60 minutes.
.TP
Expand All @@ -127,7 +127,7 @@ If \fB\-\-brief\fR is specified, only errors are printed.
.br
If \fB\-\-no\-strict\fR is specified, no changes to the cluster configuration will be made if other than specified resources would get stopped or demoted. Moving resources between nodes is allowed.
.br
If \fB\-\-simulate\fR is specified, no changes to the cluster configuration will be made and the effect of the changes will be printed instead. If \fB\-\-brief\fR is also specified, only a list of affected resources will be printed.
If \fB\-\-simulate\fR is specified, no changes to the cluster configuration will be made and the effect of the changes will be printed instead. If \fB\-\-brief\fR is also specified, only a list of affected resources not specified in the command will be printed.
.br
If \fB\-\-wait\fR is specified, pcs will wait up to 'n' seconds for the resources to stop and then return 0 if the resources are stopped or 1 if the resources have not stopped. If 'n' is not specified it defaults to 60 minutes.
.br
Expand Down
8 changes: 4 additions & 4 deletions pcs/usage.py
Original file line number Diff line number Diff line change
Expand Up @@ -852,8 +852,8 @@ def resource(args=()):
demoted. Moving resources between nodes is allowed.
If --simulate is specified, no changes to the cluster configuration
will be made and the effect of the changes will be printed instead. If
--brief is also specified, only a list of affected resources will be
printed.
--brief is also specified, only a list of affected resources not
specified in the command will be printed.
If --wait is specified, pcs will wait up to 'n' seconds for the
resources to stop and then return 0 if the resources are stopped or 1
if the resources have not stopped. If 'n' is not specified it defaults
Expand All @@ -872,8 +872,8 @@ def resource(args=()):
demoted. Moving resources between nodes is allowed.
If --simulate is specified, no changes to the cluster configuration
will be made and the effect of the changes will be printed instead. If
--brief is also specified, only a list of affected resources will be
printed.
--brief is also specified, only a list of affected resources not
specified in the command will be printed.
If --wait is specified, pcs will wait up to 'n' seconds for the
resources to stop and then return 0 if the resources are stopped or 1
if the resources have not stopped. If 'n' is not specified it defaults
Expand Down

0 comments on commit 3e479bd

Please sign in to comment.