summaryrefslogtreecommitdiff
path: root/ctdb/common
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2018-08-21 11:44:03 +1000
committerAmitay Isaacs <amitay@samba.org>2018-08-24 10:59:21 +0200
commitd003a41a9cb9ea97a7da9dbb5bd3138f82da6cf1 (patch)
tree93d85e02dc2adc65528e00da780ae54fb8807675 /ctdb/common
parent893dd623dfdec4d5c5da07f933069e4534fe58ae (diff)
downloadsamba-d003a41a9cb9ea97a7da9dbb5bd3138f82da6cf1.tar.gz
ctdb-config: Integrate failover options into conf-tool
Update and add tests accordingly. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13589 Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/common')
-rw-r--r--ctdb/common/conf_tool.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ctdb/common/conf_tool.c b/ctdb/common/conf_tool.c
index 329b20476c1..e6020c504e6 100644
--- a/ctdb/common/conf_tool.c
+++ b/ctdb/common/conf_tool.c
@@ -32,6 +32,7 @@
#include "cluster/cluster_conf.h"
#include "database/database_conf.h"
#include "event/event_conf.h"
+#include "failover/failover_conf.h"
#include "server/legacy_conf.h"
#include "common/conf_tool.h"
@@ -243,6 +244,7 @@ int conf_tool_run(struct conf_tool_context *ctx, int *result)
cluster_conf_init(ctx->conf);
database_conf_init(ctx->conf);
event_conf_init(ctx->conf);
+ failover_conf_init(ctx->conf);
legacy_conf_init(ctx->conf);
if (! conf_valid(ctx->conf)) {