summaryrefslogtreecommitdiff
path: root/priv
diff options
context:
space:
mode:
authorDaniil Fedotov <dfedotov@pivotal.io>2016-10-12 13:18:00 +0100
committerDaniil Fedotov <dfedotov@pivotal.io>2016-10-12 13:18:00 +0100
commit9207d7b413b0aecc4671081e4881b68ea5c3eb67 (patch)
tree23e0d355aef47e86872c64a6c1b123798ec624b5 /priv
parent697425f470dc19fac17f20d3c816b5d9e0f3cf6c (diff)
downloadrabbitmq-server-git-9207d7b413b0aecc4671081e4881b68ea5c3eb67.tar.gz
Support `disk` node type. Test ignore of node_type if there is no nodes
Diffstat (limited to 'priv')
-rw-r--r--priv/schema/rabbitmq.schema5
1 files changed, 2 insertions, 3 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