diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-10-12 13:18:00 +0100 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-10-12 13:18:00 +0100 |
| commit | 9207d7b413b0aecc4671081e4881b68ea5c3eb67 (patch) | |
| tree | 23e0d355aef47e86872c64a6c1b123798ec624b5 | |
| parent | 697425f470dc19fac17f20d3c816b5d9e0f3cf6c (diff) | |
| download | rabbitmq-server-git-9207d7b413b0aecc4671081e4881b68ea5c3eb67.tar.gz | |
Support `disk` node type. Test ignore of node_type if there is no nodes
| -rw-r--r-- | priv/schema/rabbitmq.schema | 5 | ||||
| -rw-r--r-- | test/config_schema_SUITE.erl | 1 | ||||
| -rw-r--r-- | test/config_schema_SUITE_data/snippets.config | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/priv/schema/rabbitmq.schema b/priv/schema/rabbitmq.schema index f6b18de72f..687101dd74 100644 --- a/priv/schema/rabbitmq.schema +++ b/priv/schema/rabbitmq.schema @@ -767,9 +767,6 @@ end}. {mapping, "autocluster.classic_config.nodes.$node", "rabbit.cluster_nodes", [{datatype, atom}]}. -{mapping, "autocluster.classic_config.nodes.$node", "rabbit.cluster_nodes", - [{datatype, atom}]}. - {mapping, "autocluster.classic_config.node_type", "rabbit.cluster_nodes", [ {datatype, {enum, [disc, disk, ram]}}, {default, disc} @@ -784,6 +781,8 @@ fun(Conf) -> Other -> case cuttlefish:conf_get("autocluster.classic_config.node_type", Conf, disc) of disc -> {Other, disc}; + % Always cast to `disc` + disk -> {Other, disc}; ram -> {Other, ram} end end diff --git a/test/config_schema_SUITE.erl b/test/config_schema_SUITE.erl index 0e354e36f9..09eb4678cd 100644 --- a/test/config_schema_SUITE.erl +++ b/test/config_schema_SUITE.erl @@ -41,7 +41,6 @@ init_per_suite(Config) -> rabbit_ct_helpers:log_environment(), Config1 = rabbit_ct_helpers:run_setup_steps(Config), DepsDir = ?config(erlang_mk_depsdir, Config1), - ct:pal("Deps dir ~p~n", [DepsDir]), Schemas = filelib:wildcard(DepsDir ++ "/*/priv/schema/*.schema"), ct:pal("Schemas ~p~n", [Schemas]), SchemaDir = filename:join(?config(data_dir, Config1), "schema"), diff --git a/test/config_schema_SUITE_data/snippets.config b/test/config_schema_SUITE_data/snippets.config index f1d3666181..8c4319fa53 100644 --- a/test/config_schema_SUITE_data/snippets.config +++ b/test/config_schema_SUITE_data/snippets.config @@ -111,9 +111,7 @@ autocluster.classic_config.node_type = disk", , {13.2, "autocluster.classic_config.node_type = ram", -[{rabbit, [ - {cluster_nodes, {[], ram}} -]}],[]} +[],[]} , {14, "tcp_listen_options.backlog = 128 |