From: Martin Schwenke <martin@meltin.net>
Date: Fri, 13 Apr 2018 09:25:56 +0000 (+1000)
Subject: ctdb-tests: Switch local daemons to use new style configuration file
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=b184761829dc291cbed696084c271316dca79607

ctdb-tests: Switch local daemons to use new style configuration file

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/tests/simple/scripts/local_daemons.bash b/ctdb/tests/simple/scripts/local_daemons.bash
index 17657069f13f..b3d0087888c7 100644
--- a/ctdb/tests/simple/scripts/local_daemons.bash
+++ b/ctdb/tests/simple/scripts/local_daemons.bash
@@ -140,14 +140,19 @@ setup_ctdb ()
 			rm -vf "${CTDB_BASE}/events.d/"*
 		fi
 
-		cat >"${CTDB_BASE}/ctdbd.conf" <<EOF
-CTDB_RECOVERY_LOCK="${SIMPLE_TESTS_VAR_DIR}/rec.lock"
-CTDB_NODE_ADDRESS="${node_ip}"
-CTDB_LOGGING="file:${CTDB_BASE}/log.ctdb"
-CTDB_DEBUGLEVEL=INFO
-CTDB_DBDIR="${db_dir}/volatile"
-CTDB_DBDIR_PERSISTENT="${db_dir}/persistent"
-CTDB_DBDIR_STATE="${db_dir}/state"
+		cat >"${CTDB_BASE}/ctdb.conf" <<EOF
+[logging]
+	location = file:${CTDB_BASE}/log.ctdb
+	log level = INFO
+
+[cluster]
+	recovery lock = ${SIMPLE_TESTS_VAR_DIR}/rec.lock
+	node address = ${node_ip}
+
+[database]
+	volatile database directory = ${db_dir}/volatile
+	persistent database directory = ${db_dir}/persistent
+	state database directory = ${db_dir}/state
 EOF
 	done
 }