Skip to content

Commit

Permalink
doc: fix pcs constraint colocation add command
Browse files Browse the repository at this point in the history
  • Loading branch information
ondrejmular committed Oct 24, 2019
1 parent d96ad5b commit a04934b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
which is not recognized by pcs ([rhbz#1712347])
- It is now possible to authenticate remote clusters in web UI even if the local
cluster is not authenticated ([rhbz#1743735])
- Documentation of `pcs constraint colocation add` ([rhbz#1734361])

[rhbz#1442116]: https://bugzilla.redhat.com/show_bug.cgi?id=1442116
[rhbz#1631514]: https://bugzilla.redhat.com/show_bug.cgi?id=1631514
Expand All @@ -33,6 +34,7 @@
[rhbz#1698763]: https://bugzilla.redhat.com/show_bug.cgi?id=1698763
[rhbz#1712347]: https://bugzilla.redhat.com/show_bug.cgi?id=1712347
[rhbz#1728890]: https://bugzilla.redhat.com/show_bug.cgi?id=1728890
[rhbz#1734361]: https://bugzilla.redhat.com/show_bug.cgi?id=1734361
[rhbz#1743735]: https://bugzilla.redhat.com/show_bug.cgi?id=1743735


Expand Down
4 changes: 2 additions & 2 deletions pcs/pcs.8
Original file line number Diff line number Diff line change
Expand Up @@ -684,8 +684,8 @@ Remove resource from any ordering constraint
colocation [show] [\fB\-\-full\fR]
List all current colocation constraints (if \fB\-\-full\fR is specified show the internal constraint id's as well).
.TP
colocation add [master|slave] <source resource id> with [master|slave] <target resource id> [score] [options] [id=constraint\-id]
Request <source resource> to run on the same node where pacemaker has determined <target resource> should run. Positive values of score mean the resources should be run on the same node, negative values mean the resources should not be run on the same node. Specifying 'INFINITY' (or '\-INFINITY') for the score forces <source resource> to run (or not run) with <target resource> (score defaults to "INFINITY"). A role can be master or slave (if no role is specified, it defaults to 'started').
colocation add [<role>] <source resource id> with [<role>] <target resource id> [score] [options] [id=constraint\-id]
Request <source resource> to run on the same node where pacemaker has determined <target resource> should run. Positive values of score mean the resources should be run on the same node, negative values mean the resources should not be run on the same node. Specifying 'INFINITY' (or '\-INFINITY') for the score forces <source resource> to run (or not run) with <target resource> (score defaults to "INFINITY"). A role can be: 'Master', 'Slave', 'Started', 'Stopped' (if no role is specified, it defaults to 'Started').
.TP
colocation set <resource1> [resourceN]... [options] [set <resourceX> ... [options]] [setoptions [constraint_options]]
Create a colocation constraint with a resource set. Available options are sequential=true/false and role=Stopped/Started/Master/Slave. Available constraint_options are id and either of: score, score\-attribute, score\-attribute\-mangle.
Expand Down
6 changes: 3 additions & 3 deletions pcs/usage.py
Original file line number Diff line number Diff line change
Expand Up @@ -1323,16 +1323,16 @@ def constraint(args=(), pout=True):
List all current colocation constraints (if --full is specified show
the internal constraint id's as well).
colocation add [master|slave] <source resource id> with [master|slave]
colocation add [<role>] <source resource id> with [<role>]
<target resource id> [score] [options] [id=constraint-id]
Request <source resource> to run on the same node where pacemaker has
determined <target resource> should run. Positive values of score
mean the resources should be run on the same node, negative values
mean the resources should not be run on the same node. Specifying
'INFINITY' (or '-INFINITY') for the score forces <source resource> to
run (or not run) with <target resource> (score defaults to "INFINITY").
A role can be master or slave (if no role is specified, it defaults to
'started').
A role can be: 'Master', 'Slave', 'Started', 'Stopped' (if no role is
specified, it defaults to 'Started').
colocation set <resource1> [resourceN]... [options]
[set <resourceX> ... [options]]
Expand Down

0 comments on commit a04934b

Please sign in to comment.