update autogenerated docs

diff --git a/api-viewer/apidata.js b/api-viewer/apidata.js
index c61bc1150517386251b1cb1542142fe7dd282c9a..408f064ba1aacf8eed7dddf268f3495bb8b3e342 100644 (file)
--- a/api-viewer/apidata.js
+++ b/api-viewer/apidata.js
@@ -2567,14 +2567,17 @@ var pveapi = [
                                        "typetext" : "<type>:<name>"
                                     },
                                     "state" : {
-                                       "default" : "enabled",
-                                       "description" : "Resource state.",
+                                       "default" : "started",
+                                       "description" : "Requested resource state.",
                                        "enum" : [
+                                          "started",
+                                          "stopped",
                                           "enabled",
                                           "disabled"
                                        ],
                                        "optional" : 1,
-                                       "type" : "string"
+                                       "type" : "string",
+                                       "verbose_description" : "Requested resource state. The CRM reads this state and acts accordingly.\nPlease note that `enabled` is just an alias for `started`.\n\n`started`;;\n\nThe CRM tries to start the resource. Service state is\nset to `started` after successful start. On node failures, or when start\nfails, it tries to recover the resource.  If everything fails, service\nstate it set to `error`.\n\n`stopped`;;\n\nThe CRM tries to keep the resource in `stopped` state, but it\nstill tries to relocate the resources on node failures.\n\n`disabled`;;\n\nThe CRM tries to put the resource in `stopped` state, but does not try\nto relocate the resources on node failures. The main purpose of this\nstate is error recovery, because it is the only way to move a resource out\nof the `error` state.\n\n"
                                     }
                                  },
                                  "type" : "object"
@@ -2689,14 +2692,17 @@ var pveapi = [
                                  "typetext" : "<type>:<name>"
                               },
                               "state" : {
-                                 "default" : "enabled",
-                                 "description" : "Resource state.",
+                                 "default" : "started",
+                                 "description" : "Requested resource state.",
                                  "enum" : [
+                                    "started",
+                                    "stopped",
                                     "enabled",
                                     "disabled"
                                  ],
                                  "optional" : 1,
-                                 "type" : "string"
+                                 "type" : "string",
+                                 "verbose_description" : "Requested resource state. The CRM reads this state and acts accordingly.\nPlease note that `enabled` is just an alias for `started`.\n\n`started`;;\n\nThe CRM tries to start the resource. Service state is\nset to `started` after successful start. On node failures, or when start\nfails, it tries to recover the resource.  If everything fails, service\nstate it set to `error`.\n\n`stopped`;;\n\nThe CRM tries to keep the resource in `stopped` state, but it\nstill tries to relocate the resources on node failures.\n\n`disabled`;;\n\nThe CRM tries to put the resource in `stopped` state, but does not try\nto relocate the resources on node failures. The main purpose of this\nstate is error recovery, because it is the only way to move a resource out\nof the `error` state.\n\n"
                               },
                               "type" : {
                                  "description" : "Resource type.",
@@ -2824,11 +2830,12 @@ var pveapi = [
                                        "typetext" : "<string>"
                                     },
                                     "nodes" : {
-                                       "description" : "List of cluster node names with optional priority. We use priority '0' as default. The CRM tries to run services on the node with highest priority (also see option 'nofailback').",
+                                       "description" : "List of cluster node names with optional priority.",
                                        "format" : "pve-ha-group-node-list",
                                        "optional" : 1,
                                        "type" : "string",
-                                       "typetext" : "<node>[:<pri>]{,<node>[:<pri>]}*"
+                                       "typetext" : "<node>[:<pri>]{,<node>[:<pri>]}*",
+                                       "verbose_description" : "List of cluster node members, where a priority can be given to each node. A resource bound to a group will run on the available nodes with the highest priority. If there are more nodes in the highest priority class, the services will get distributed to those nodes. The priorities have a relative meaning only."
                                     },
                                     "nofailback" : {
                                        "default" : 0,
@@ -2923,11 +2930,12 @@ var pveapi = [
                                  "typetext" : "<string>"
                               },
                               "nodes" : {
-                                 "description" : "List of cluster node names with optional priority. We use priority '0' as default. The CRM tries to run services on the node with highest priority (also see option 'nofailback').",
+                                 "description" : "List of cluster node names with optional priority.",
                                  "format" : "pve-ha-group-node-list",
                                  "optional" : 0,
                                  "type" : "string",
-                                 "typetext" : "<node>[:<pri>]{,<node>[:<pri>]}*"
+                                 "typetext" : "<node>[:<pri>]{,<node>[:<pri>]}*",
+                                 "verbose_description" : "List of cluster node members, where a priority can be given to each node. A resource bound to a group will run on the available nodes with the highest priority. If there are more nodes in the highest priority class, the services will get distributed to those nodes. The priorities have a relative meaning only."
                               },
                               "nofailback" : {
                                  "default" : 0,

diff --git a/ha-manager.1-synopsis.adoc b/ha-manager.1-synopsis.adoc
index feb156ccf361f01be8b3152139dbaffd18b240b4..0c6ea484bb08c55887209b1179f187bb365c6220 100644 (file)
--- a/ha-manager.1-synopsis.adoc
+++ b/ha-manager.1-synopsis.adoc
@@ -24,9 +24,9 @@ Maximal number of service relocate tries when a service failes to start.
 
 Maximal number of tries to restart the service on a node after its start failed.
 
-`-state` `<disabled | enabled>` ('default =' `enabled`)::
+`-state` `<disabled | enabled | started | stopped>` ('default =' `started`)::
 
-Resource state.
+Requested resource state.
 
 `-type` `<ct | vm>` ::
 
@@ -45,27 +45,6 @@ Only list resources of specific type
 
 
 
-*ha-manager disable* `<sid>`
-
-Disable a HA resource.
-
-`<sid>`: `<type>:<name>` ::
-
-HA resource ID. This consists of a resource type followed by a resource specific name, separated with colon (example: vm:100 / ct:100). For virtual machines and containers, you can simply use the VM or CT id as a shortcut (example: 100).
-
-
-
-*ha-manager enable* `<sid>`
-
-Enable a HA resource.
-
-`<sid>`: `<type>:<name>` ::
-
-HA resource ID. This consists of a resource type followed by a resource specific name, separated with colon (example: vm:100 / ct:100). For virtual machines and containers, you can simply use the VM or CT id as a shortcut (example: 100).
-
-
-
-
 *ha-manager groupadd* `<group> -nodes <string>` `[OPTIONS]`
 
 Create a new HA group.
@@ -80,7 +59,7 @@ Description.
 
 `-nodes` `<node>[:<pri>]{,<node>[:<pri>]}*` ::
 
-List of cluster node names with optional priority. We use priority '0' as default. The CRM tries to run services on the node with highest priority (also see option 'nofailback').
+List of cluster node names with optional priority.
 
 `-nofailback` `<boolean>` ('default =' `0`)::
 
@@ -134,7 +113,7 @@ Prevent changes if current configuration file has different SHA1 digest. This ca
 
 `-nodes` `<node>[:<pri>]{,<node>[:<pri>]}*` ::
 
-List of cluster node names with optional priority. We use priority '0' as default. The CRM tries to run services on the node with highest priority (also see option 'nofailback').
+List of cluster node names with optional priority.
 
 `-nofailback` `<boolean>` ('default =' `0`)::
 
@@ -233,9 +212,9 @@ Maximal number of service relocate tries when a service failes to start.
 
 Maximal number of tries to restart the service on a node after its start failed.
 
-`-state` `<disabled | enabled>` ('default =' `enabled`)::
+`-state` `<disabled | enabled | started | stopped>` ('default =' `started`)::
 
-Resource state.
+Requested resource state.