summaryrefslogtreecommitdiff
path: root/templates-cfg
diff options
context:
space:
mode:
authorAn-Cheng Huang <ancheng@vyatta.com>2008-02-07 15:48:45 -0800
committerAn-Cheng Huang <ancheng@vyatta.com>2008-02-07 15:48:45 -0800
commite4105d088ddda49c4d5c2b88ee81daa793e24204 (patch)
tree0240a6aedcb303ac224b90235a1a5ff1d8212a9d /templates-cfg
parentba4e3496cad40c2b288893dfe693a35487316dff (diff)
downloadvyatta-cluster-e4105d088ddda49c4d5c2b88ee81daa793e24204.tar.gz
vyatta-cluster-e4105d088ddda49c4d5c2b88ee81daa793e24204.zip
* fix for bug 2769: allow resource script as service.
* add more flexible service specification. * unit for timer is now milliseconds. * fix for bug 2770: use IPaddr2 as IP address handler. * change default timers.
Diffstat (limited to 'templates-cfg')
-rw-r--r--templates-cfg/cluster/dead-interval/node.def4
-rw-r--r--templates-cfg/cluster/group/node.tag/service/node.def7
-rw-r--r--templates-cfg/cluster/keepalive-interval/node.def4
3 files changed, 11 insertions, 4 deletions
diff --git a/templates-cfg/cluster/dead-interval/node.def b/templates-cfg/cluster/dead-interval/node.def
index 3b110b4..c34cc50 100644
--- a/templates-cfg/cluster/dead-interval/node.def
+++ b/templates-cfg/cluster/dead-interval/node.def
@@ -1,3 +1,3 @@
type: u32
-help: How long until a node is considered dead after missing heartbeats (seconds)
-default: 20
+help: How long until a node is considered dead after missing heartbeats (milliseconds)
+default: 20000
diff --git a/templates-cfg/cluster/group/node.tag/service/node.def b/templates-cfg/cluster/group/node.tag/service/node.def
index e030ec3..17fa077 100644
--- a/templates-cfg/cluster/group/node.tag/service/node.def
+++ b/templates-cfg/cluster/group/node.tag/service/node.def
@@ -1,3 +1,10 @@
multi:
type: txt
help: IP address(es) or service name(s) in this resource group
+comp_help: Possible completions:
+ <service name> Name of system service to be clustered
+ <IP addr>/<prefix len> IP address (with subnet mask length) to be clustered
+
+For IP addresses, additional parameters can optionally be specified:
+ <IP addr>/<prefix len>/<interface>
+ <IP addr>/<prefix len>/<interface>/<broadcast addr>
diff --git a/templates-cfg/cluster/keepalive-interval/node.def b/templates-cfg/cluster/keepalive-interval/node.def
index e321021..ab3f172 100644
--- a/templates-cfg/cluster/keepalive-interval/node.def
+++ b/templates-cfg/cluster/keepalive-interval/node.def
@@ -1,3 +1,3 @@
type: u32
-help: Time interval between heartbeat packets (seconds)
-default: 5
+help: Time interval between heartbeat packets (milliseconds)
+default: 5000