diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-04-05 10:54:00 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2018-05-12 06:11:17 +0200 |
| commit | 130f37c23f9570c4cf2d87a4bc5502569dab1179 (patch) | |
| tree | 1433c8909a75accf9f6a8a7d120f0cf9d8e618b7 /ctdb/config | |
| parent | 574af23e9d56ad009820e7ea103a214c115adc51 (diff) | |
| download | samba-130f37c23f9570c4cf2d87a4bc5502569dab1179.tar.gz | |
ctdb-scripts: Don't check for CTDB_PARTIALLY_ONLINE_INTERFACES clash
Just document that NAT gateway and LVS are not compatible with this
option. Update the documentation to make it clear that this is a
10.interface option.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/config')
| -rwxr-xr-x | ctdb/config/events.d/11.natgw | 4 | ||||
| -rwxr-xr-x | ctdb/config/events.d/91.lvs | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/ctdb/config/events.d/11.natgw b/ctdb/config/events.d/11.natgw index cf80d41c41e..18b064a1efb 100755 --- a/ctdb/config/events.d/11.natgw +++ b/ctdb/config/events.d/11.natgw @@ -47,10 +47,6 @@ natgw_check_config () [ -n "$CTDB_NATGW_PRIVATE_NETWORK" ] || \ die "Invalid configuration: CTDB_NATGW_PRIVATE_NETWORK not set" - if [ "$CTDB_PARTIALLY_ONLINE_INTERFACES" = "yes" ] ; then - die "Invalid configuration: CTDB_PARTIALLY_ONLINE_INTERFACES=yes incompatible with NAT gateway" - fi - # The default is to create a single default route [ -n "$CTDB_NATGW_STATIC_ROUTES" ] || CTDB_NATGW_STATIC_ROUTES="0.0.0.0/0" } diff --git a/ctdb/config/events.d/91.lvs b/ctdb/config/events.d/91.lvs index c70f0c13158..b3d65f44607 100755 --- a/ctdb/config/events.d/91.lvs +++ b/ctdb/config/events.d/91.lvs @@ -37,10 +37,6 @@ lvs_check_config () [ -n "$CTDB_LVS_PUBLIC_IFACE" ] || \ die "Invalid configuration: CTDB_LVS_PUBLIC_IFACE not set" fi - - if [ "$CTDB_PARTIALLY_ONLINE_INTERFACES" = "yes" ] ; then - die "Invalid configuration: CTDB_PARTIALLY_ONLINE_INTERFACES=yes incompatible with LVS" - fi } case "$1" in |