diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-04-10 11:58:57 +1000 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2014-04-14 06:06:49 +0200 |
| commit | 2f2421bae1a8ff46ad54f76d02e6dd1c3ffe3300 (patch) | |
| tree | b30e1aaf874c27de108ae8979172244972e16fd4 /ctdb/doc | |
| parent | ce8ac88b969bb8bb7a94e62bb6e86aec389be6ac (diff) | |
| download | samba-2f2421bae1a8ff46ad54f76d02e6dd1c3ffe3300.tar.gz | |
ctdb-eventscripts: CTDB_NATGW_PUBLIC_* optional on slave-only nodes
Commit 4ee4925d416a86341bd76c11fa99ec9173682a1d forgot about
CTDB_NATGW_SLAVE_ONLY so it introduces an incorrect failure when this
is set, and CTDB_NATGW_PUBLIC_IFACE or CTDB_NATGW_PUBLIC_IP is unset.
Relax the sanity check to see if CTDB_NATGW_SLAVE_ONLY is set.
Update the documentation to explicitly state that
CTDB_NATGW_PUBLIC_IFACE and CTDB_NATGW_PUBLIC_IP are optional and
unused if CTDB_NATGW_SLAVE_ONLY is set. It would be possible to
insist that CTDB_NATGW_PUBLIC_IFACE and CTDB_NATGW_PUBLIC_IFACE should
be unset in that case. However, it is more reasonable to allow
consistent configuration across nodes except with some nodes
configured slave-only.
Add tests, update infrastructure and fix a thinko in the stub's
"natgwlist" implementation.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Mon Apr 14 06:06:49 CEST 2014 on sn-devel-104
Diffstat (limited to 'ctdb/doc')
| -rw-r--r-- | ctdb/doc/ctdbd.conf.5.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml index 188a4df093f..98d09249320 100644 --- a/ctdb/doc/ctdbd.conf.5.xml +++ b/ctdb/doc/ctdbd.conf.5.xml @@ -537,7 +537,11 @@ <term>CTDB_NATGW_SLAVE_ONLY=yes|no</term> <listitem> <para> - When set to "yes" a node can not be a NAT gateway master node. + When set to "yes" a node can not be a NAT gateway master + node. In this case + <varname>CTDB_NATGW_PUBLIC_IFACE</varname> and + <varname>CTDB_NATGW_PUBLIC_IP</varname> are optional + and unused. </para> <para> Default is no. |