Ap-Configuration.txt | 4 ++--
Ch-Active-Active.txt | 10 +++++-----
Ch-Active-Passive.txt | 4 ++--
Ch-Apache.txt | 4 ++--
Ch-Installation.txt | 2 +-
Ch-Shared-Storage.txt | 4 ++--
Ch-Stonith.txt | 4 ++--
Ch-Tools.txt | 37 ++++++++++++++++++++-----------------
Ch-Verification.txt | 2 +-
9 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/doc/Clusters_from_Scratch/en-US/Ap-Configuration.txt b/doc/Clusters_from_Scratch/en-US/Ap-Configuration.txt
index 5852e7e..0cbfeec 100644
--- a/doc/Clusters_from_Scratch/en-US/Ap-Configuration.txt
+++ b/doc/Clusters_from_Scratch/en-US/Ap-Configuration.txt
@@ -19,7 +19,7 @@ ifdef::pcs[]
Started: [ pcmk-1 pcmk-2 ]
Clone Set: WebSite-clone [WebSite]
Started: [ pcmk-1 pcmk-2 ]
-# pcs resource rsc defaults
+# pcs resource defaults
resource-stickiness: 100
# pcs resource op defaults
timeout: 240s
@@ -303,7 +303,7 @@ ifdef::pcs[]
* resource-stickiness - Specify the aversion to moving resources to other machines
[source,C]
----
-# pcs resource rsc defaults
+# pcs resource defaults
resource-stickiness: 100
----
endif::[]
diff --git a/doc/Clusters_from_Scratch/en-US/Ch-Active-Active.txt b/doc/Clusters_from_Scratch/en-US/Ch-Active-Active.txt
index f434b9d..5943c19 100644
--- a/doc/Clusters_from_Scratch/en-US/Ch-Active-Active.txt
+++ b/doc/Clusters_from_Scratch/en-US/Ch-Active-Active.txt
@@ -80,7 +80,7 @@ are not only stopped, but stopped in the correct order.
ifdef::pcs[]
[source,C]
----
-# pcs resource stop WebFS
+# pcs resource disable WebFS
# pcs resource
ClusterIP (ocf::heartbeat:IPaddr2) Started
WebSite (ocf::heartbeat:apache) Stopped
@@ -94,7 +94,7 @@ endif::[]
ifdef::crmsh[]
[source,C]
-----
-# crm resource stop WebFS
+# crm resource disable WebFS
# crm_mon -1
============
Last updated: Tue Apr 3 14:07:36 2012
@@ -222,7 +222,7 @@ ifdef::pcs[]
WebFS (ocf::heartbeat:Filesystem) Stopped
Clone Set: dlm-clone [dlm]
Stopped: [ dlm:0 dlm:1 ]
-# pcs cluster push cib dlm_cfg
+# pcs cluster cib-push dlm_cfg
CIB updated
# pcs status
@@ -695,8 +695,8 @@ shell and watching the cluster's response
ifdef::pcs[]
[source,C]
-----
-# pcs cluster push cib active_cfg
-# pcs resource start WebFS
+# pcs cluster cib-push active_cfg
+# pcs resource enable WebFS
-----
After all the processes are started the status should look
diff --git a/doc/Clusters_from_Scratch/en-US/Ch-Active-Passive.txt b/doc/Clusters_from_Scratch/en-US/Ch-Active-Passive.txt
index 7da8fca..c91647b 100644
--- a/doc/Clusters_from_Scratch/en-US/Ch-Active-Passive.txt
+++ b/doc/Clusters_from_Scratch/en-US/Ch-Active-Passive.txt
@@ -656,8 +656,8 @@ resource, but it is often sufficient to change the default.
ifdef::pcs[]
[source,C]
----
-# pcs resource rsc defaults resource-stickiness=100
-# pcs resource rsc defaults
+# pcs resource defaults resource-stickiness=100
+# pcs resource defaults
resource-stickiness: 100
----
endif::[]
diff --git a/doc/Clusters_from_Scratch/en-US/Ch-Apache.txt b/doc/Clusters_from_Scratch/en-US/Ch-Apache.txt
index 5833f43..71777db 100644
--- a/doc/Clusters_from_Scratch/en-US/Ch-Apache.txt
+++ b/doc/Clusters_from_Scratch/en-US/Ch-Apache.txt
@@ -601,7 +601,7 @@ WebSite will be forced to move to pcmk-1.
[source,C]
-----
# pcs constraint location WebSite prefers pcmk-1=INFINITY
-# pcs constraint all
+# pcs constraint --full
Location Constraints:
Resource: WebSite
Enabled on: pcmk-1 (score:INFINITY) (id:location-WebSite-pcmk-1-INFINITY)
@@ -708,7 +708,7 @@ Ordering Constraints:
start ClusterIP then start WebSite (Mandatory) (id:order-ClusterIP-WebSite-mandatory)
Colocation Constraints:
WebSite with ClusterIP (INFINITY) (id:colocation-WebSite-ClusterIP-INFINITY)
-# pcs constraint rm location-WebSite-pcmk-1-INFINITY
+# pcs constraint remove location-WebSite-pcmk-1-INFINITY
# pcs constraint
Location Constraints:
Ordering Constraints:
diff --git a/doc/Clusters_from_Scratch/en-US/Ch-Installation.txt b/doc/Clusters_from_Scratch/en-US/Ch-Installation.txt
index fadb91c..cf84d79 100644
--- a/doc/Clusters_from_Scratch/en-US/Ch-Installation.txt
+++ b/doc/Clusters_from_Scratch/en-US/Ch-Installation.txt
@@ -997,7 +997,7 @@ Password:
pcmk-1: Authorized
pcmk-2: Authorized
-# pcs cluster setup mycluster pcmk-1 pcmk-2
+# pcs cluster setup --name mycluster pcmk-1 pcmk-2
pcmk-1: Succeeded
pcmk-2: Succeeded
----
diff --git a/doc/Clusters_from_Scratch/en-US/Ch-Shared-Storage.txt b/doc/Clusters_from_Scratch/en-US/Ch-Shared-Storage.txt
index f6b50d9..cc2cec6 100644
--- a/doc/Clusters_from_Scratch/en-US/Ch-Shared-Storage.txt
+++ b/doc/Clusters_from_Scratch/en-US/Ch-Shared-Storage.txt
@@ -334,7 +334,7 @@ cib.
[source,C]
----
-# pcs cluster push cib drbd_cfg
+# pcs cluster cib-push drbd_cfg
CIB updated
# pcs status
@@ -594,7 +594,7 @@ cluster put it into effect.
ifdef::pcs[]
[source,C]
----
-# pcs cluster push cib fs_cfg
+# pcs cluster cib-push fs_cfg
CIB updated
# pcs status
Last updated: Fri Aug 10 12:47:01 2012
diff --git a/doc/Clusters_from_Scratch/en-US/Ch-Stonith.txt b/doc/Clusters_from_Scratch/en-US/Ch-Stonith.txt
index 123bd4b..9518fc2 100644
--- a/doc/Clusters_from_Scratch/en-US/Ch-Stonith.txt
+++ b/doc/Clusters_from_Scratch/en-US/Ch-Stonith.txt
@@ -81,7 +81,7 @@ ifdef::crmsh[]
endif::[]
ifdef::pcs[]
-. Commit the new configuration. +pcs cluster push cib stonith_cfg+
+. Commit the new configuration. +pcs cluster cib-push stonith_cfg+
endif::[]
. Once the stonith resource is running, you can test it by executing:
@@ -261,7 +261,7 @@ Now push the configuration into the cluster.
ifdef::pcs[]
[source,C]
----
-# pcs cluster push cib stonith_cfg
+# pcs cluster cib-push stonith_cfg
----
endif::[]
diff --git a/doc/Clusters_from_Scratch/en-US/Ch-Tools.txt b/doc/Clusters_from_Scratch/en-US/Ch-Tools.txt
index 6872780..04de80c 100644
--- a/doc/Clusters_from_Scratch/en-US/Ch-Tools.txt
+++ b/doc/Clusters_from_Scratch/en-US/Ch-Tools.txt
@@ -46,16 +46,19 @@ use, (corosync 2.0 with votequorum + Pacemaker version >= 1.1.8).
Control and configure pacemaker and corosync.
Options:
- -h Display usage and exit
+ -h, --help Display usage and exit
-f file Perform actions on file instead of active CIB
+ --debug Print all network traffic and external commands run
+ --version Print pcs version information
Commands:
- resource Manage cluster resources
cluster Configure cluster options and nodes
+ resource Manage cluster resources
stonith Configure fence devices
- property Set pacemaker properties
constraint Set resource constraints
+ property Set pacemaker properties
status View cluster status
+ config Print full cluster configuration
.....
As you can see, the different aspects of cluster management are broken
@@ -71,33 +74,33 @@ is an example of all the options available under the status category.
Usage: pcs status [commands]...
View current cluster and resource status
Commands:
- status
+ [status]
View all information about the cluster and resources
- status resources
+ resources
View current status of cluster resources
- status groups
+ groups
View currently configured groups and their resources
- status cluster
+ cluster
View current cluster status
- status corosync
- View current corosync status
-
- status nodes [corosync]
- View current status of nodes from pacemaker, or if corosync is
- specified, print nodes currently configured in corosync
+ corosync
+ View current membership information as seen by corosync
- status actions
- View failed actions
+ nodes [corosync|both|config]
+ View current status of nodes from pacemaker. If 'corosync' is
+ specified, print nodes currently configured in corosync, if 'both'
+ is specified, print nodes from both corosync & pacemaker. If 'config'
+ is specified, print nodes from corosync & pacemaker configuration.
- status pcsd <node> ...
+ pcsd <node> ...
Show the current status of pcsd on the specified nodes
- status xml
+ xml
View xml version of status (output from crm_mon -r -1 -X)
+
.....
Additionally, if you are interested in the Pacemaker version and
diff --git a/doc/Clusters_from_Scratch/en-US/Ch-Verification.txt b/doc/Clusters_from_Scratch/en-US/Ch-Verification.txt
index 7fcff9d..530e37b 100644
--- a/doc/Clusters_from_Scratch/en-US/Ch-Verification.txt
+++ b/doc/Clusters_from_Scratch/en-US/Ch-Verification.txt
@@ -99,7 +99,7 @@ runtime.totem.pg.mrp.srp.members.2.status (str) = joined
Membership information
--------------------------
Nodeid Votes Name
- 1 1 pcmk-1
+ 1 1 pcmk-1 (local)
2 1 pcmk-2
----
_______________________________________________
Pacemaker mailing list: [email protected]
http://oss.clusterlabs.org/mailman/listinfo/pacemaker
Project Home: http://www.clusterlabs.org
Getting started: http://www.clusterlabs.org/doc/Cluster_from_Scratch.pdf
Bugs: http://bugs.clusterlabs.org
