sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

ctdb-scripts: Use load_script_options() in miscellaneous scripts

Browse Source 
Some of these just aim to load the generic script.options file while
others target more specific files.

For NFS configuration, always use 60.nfs.options - even for 06.nfs.
This could be carefully documented but will change a lot before
release so there is no need.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2018-04-04 19:16:57 +10:00 committed by Amitay Isaacs
parent 02444e5f47
commit ac1c12b5a2
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/config/ctdb-crash-cleanup.sh
View File

@ -14,7 +14,7 @@ if service ctdb status >/dev/null 2>&1 ; then
exit 0
fi
loadconfig
load_script_options "failover" "11.natgw"
if [ ! -f "$CTDB_BASE/public_addresses" ] ; then
die "No public addresses file found. Can't clean up."

2
ctdb/config/debug-hung-script.sh
View File

@ -8,7 +8,7 @@
. "${CTDB_BASE}/functions"
loadconfig
load_script_options
# Testing hook
if [ -n "$CTDB_DEBUG_HUNG_SCRIPT_LOGFILE" ] ; then

2
ctdb/config/debug_locks.sh
View File

@ -17,7 +17,7 @@
CTDB_DBDIR="${CTDB_VARDIR}/volatile"
CTDB_DBDIR_PERSISTENT="${CTDB_VARDIR}/persistent"
loadconfig
load_script_options
(
flock -n 9 || exit 1

2
ctdb/config/events.d/06.nfs
View File

@ -8,7 +8,7 @@
service_name="nfs"
load_script_options
load_script_options "service" "60.nfs"
ctdb_setup_state_dir "service" "$service_name"

2
ctdb/tests/eventscripts/06.nfs.releaseip.001.sh
View File

@ -6,7 +6,7 @@ define_test "callout is 'true'"
setup
setup_script_options <<EOF
setup_script_options "service" "60.nfs" <<EOF
CTDB_NFS_CALLOUT="true"
EOF

2
ctdb/tests/eventscripts/06.nfs.releaseip.002.sh
View File

@ -6,7 +6,7 @@ define_test "callout is 'false', causes releaseip-pre to fail"
setup
setup_script_options <<EOF
setup_script_options "service" "60.nfs" <<EOF
CTDB_NFS_CALLOUT="echo releaseip-pre ; false"
EOF

2
ctdb/tests/eventscripts/06.nfs.takeip.001.sh
View File

@ -6,7 +6,7 @@ define_test "callout is 'true'"
setup
setup_script_options <<EOF
setup_script_options "service" "60.nfs" <<EOF
CTDB_NFS_CALLOUT="true"
EOF

2
ctdb/tests/eventscripts/06.nfs.takeip.002.sh
View File

@ -6,7 +6,7 @@ define_test "callout is 'false', causes takeip-pre to fail"
setup
setup_script_options <<EOF
setup_script_options "service" "60.nfs" <<EOF
CTDB_NFS_CALLOUT="echo takeip-pre ; false"
EOF

2
ctdb/tests/eventscripts/scripts/06.nfs.sh
View File

@ -1,6 +1,6 @@
setup ()
{
setup_script_options <<EOF
setup_script_options "service" "60.nfs" <<EOF
CTDB_MANAGES_NFS="yes"
EOF
}

2
ctdb/tools/ctdb_lvs
View File

@ -6,7 +6,7 @@ fi
. "${CTDB_BASE}/functions"
loadconfig
load_script_options "failover" "91.lvs"
# Default LVS nodes file location
[ -n "$CTDB_LVS_NODES" ] || CTDB_LVS_NODES="${CTDB_BASE}/lvs_nodes"

2
ctdb/tools/ctdb_natgw
View File

@ -6,7 +6,7 @@ fi
. "${CTDB_BASE}/functions"
loadconfig
load_script_options "failover" "11.natgw"
# Default NAT gateway nodes file location
[ -n "$CTDB_NATGW_NODES" ] || CTDB_NATGW_NODES="${CTDB_BASE}/natgw_nodes"