bump version to 6.1-4

[pve-docs.git] / datacenter.cfg.5-opts.adoc

diff --git a/datacenter.cfg.5-opts.adoc b/datacenter.cfg.5-opts.adoc
index 2b9fd2148e50c59958190a8d6664e9569f9bad6e..9e06beff425dc8483f88220f2e61380f11db0f6e 100644 (file)
--- a/datacenter.cfg.5-opts.adoc
+++ b/datacenter.cfg.5-opts.adoc
@@ -36,13 +36,13 @@ Set the fencing mode of the HA cluster. Hardware mode needs a valid configuratio
 +
 WARNING: 'hardware' and 'both' are EXPERIMENTAL & WIP
 
-`ha`: `shutdown_policy=<freeze|failover|conditional>` ::
+`ha`: `shutdown_policy=<enum>` ::
 
 Cluster wide HA settings.
 
-`shutdown_policy`=`<conditional | failover | freeze>` ('default =' `conditional`);;
+`shutdown_policy`=`<conditional | failover | freeze | migrate>` ('default =' `conditional`);;
 
-Describes the policy for handling HA services on poweroff or reboot of a node. Freeze will always freeze services which are still located on the node on shutdown, those services won't be recovered by the HA manager. Failover will not mark the services as frozen and thus the services will get recovered to other nodes, if the shutdown node does not come up again quickly (< 1min). 'conditional' chooses automatically depending on the type of shutdown, i.e., on a reboot the service will be frozen but on a poweroff the service will stay as is, and thus get recovered after about 2 minutes.
+Describes the policy for handling HA services on poweroff or reboot of a node. Freeze will always freeze services which are still located on the node on shutdown, those services won't be recovered by the HA manager. Failover will not mark the services as frozen and thus the services will get recovered to other nodes, if the shutdown node does not come up again quickly (< 1min). 'conditional' chooses automatically depending on the type of shutdown, i.e., on a reboot the service will be frozen but on a poweroff the service will stay as is, and thus get recovered after about 2 minutes. Migrate will try to move all running services to another node on both, rebootand shutdown. The poweroff process will only continue once no running services are located on the node anymore. If the node comes up again, the service will be moved back to the previously powered-off node, at least if no other migration, reloaction or recovery took place.
 
 `http_proxy`: `http://.*` ::
 
@@ -52,7 +52,7 @@ Specify external http proxy which is used for downloads (example: 'http://userna
 
 Default keybord layout for vnc server.
 
-`language`: `<ca | de | en | es | eu | fa | fr | it | ja | nb | nn | pl | pt_BR | ru | sl | sv | tr | zh_CN | zh_TW>` ::
+`language`: `<ca | da | de | en | es | eu | fa | fr | he | it | ja | nb | nn | pl | pt_BR | ru | sl | sv | tr | zh_CN | zh_TW>` ::
 
 Default GUI language.