summaryrefslogtreecommitdiffstats
path: root/ctdb/tests/scripts
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2013-10-15 11:54:58 +1100
committerAmitay Isaacs <amitay@gmail.com>2013-10-22 14:34:04 +1100
commit4526fdbbca4fbadc53ec354ceca7cc59ba3a31b6 (patch)
tree0546311c4810f2bc10f6be5f5379764a480d1142 /ctdb/tests/scripts
parent1043b53d12c466010a4a70c5edbc3e3d91a1ba06 (diff)
scripts: Remove support for CTDB_OPTIONS configuration variable
Allowing people to put random options in CTDB_OPTIONS complicates some logic (particularly around use of syslog). If we're going to have variables for options then let's make sure we have a variable for each option and make people use them. Signed-off-by: Martin Schwenke <martin@meltin.net> (This used to be ctdb commit e55f3a1577eff0182802b0341d865d961aeae1c7)
Diffstat (limited to 'ctdb/tests/scripts')
-rw-r--r--ctdb/tests/scripts/integration.bash6
1 files changed, 0 insertions, 6 deletions
diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index 888528cb2b..59f37c919e 100644
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -620,12 +620,6 @@ _ctdb_hack_options ()
{
local ctdb_options="$*"
- # We really just want to pass CTDB_OPTIONS but on RH
- # /etc/sysconfig/ctdb can, and frequently does, set that variable.
- # So instead, we hack badly. We'll add these as we use them.
- # Note that these may still be overridden by the above file... but
- # we tend to use the exotic options here... so that is unlikely.
-
case "$ctdb_options" in
*--start-as-stopped*)
export CTDB_START_AS_STOPPED="yes"