summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2016-10-25 17:50:02 +0300
committerMichael Klishin <mklishin@pivotal.io>2016-10-25 17:50:02 +0300
commit672d0c156b036047010feda8ba787bbad4c699e9 (patch)
tree8835f6721c894a1f0ee31d89f8ac83b900a32958 /test
parent3ad0b674caaa7a898f525933590acfd4f0d99d3c (diff)
downloadrabbitmq-server-git-672d0c156b036047010feda8ba787bbad4c699e9.tar.gz
Initial DNS backend config schema support; decouple autocluster node type key
Since node type won't vary from backend to backend we should pull it up to `autocluster.node_type`.
Diffstat (limited to 'test')
-rw-r--r--test/config_schema_SUITE_data/snippets.config39
1 files changed, 33 insertions, 6 deletions
diff --git a/test/config_schema_SUITE_data/snippets.config b/test/config_schema_SUITE_data/snippets.config
index 8c4319fa53..114c931622 100644
--- a/test/config_schema_SUITE_data/snippets.config
+++ b/test/config_schema_SUITE_data/snippets.config
@@ -96,22 +96,26 @@ default_permissions.write = .*",
{13,
"autocluster.classic_config.nodes.peer1 = rabbit@hostname1
autocluster.classic_config.nodes.peer2 = rabbit@hostname2
-autocluster.classic_config.node_type = disc",
+autocluster.node_type = disc",
[{rabbit, [
+ {autocluster, [{node_type, disc}]},
{cluster_nodes, {[rabbit@hostname2,rabbit@hostname1], disc}}
]}],[]}
,
{13.1,
"autocluster.classic_config.nodes.peer1 = rabbit@hostname1
autocluster.classic_config.nodes.peer2 = rabbit@hostname2
-autocluster.classic_config.node_type = disk",
+autocluster.node_type = disk",
[{rabbit, [
+ {autocluster, [{node_type, disc}]},
{cluster_nodes, {[rabbit@hostname2,rabbit@hostname1], disc}}
]}],[]}
,
{13.2,
-"autocluster.classic_config.node_type = ram",
-[],[]}
+"autocluster.node_type = ram",
+[{rabbit, [
+ {autocluster, [{node_type,ram}]}
+]}],[]}
,
{14,
"tcp_listen_options.backlog = 128
@@ -713,7 +717,7 @@ web_stomp.ssl.password = changeme",
[{rabbitmq_web_stomp,
[{sockjs_opts, [{sockjs_url, "https://cdn.jsdelivr.net/sockjs/0.3.4/sockjs.min.js"}]}]}],
[rabbitmq_web_stomp]},
-{69,
+{69,
"auth_backends.1 = http
rabbitmq_auth_backend_http.user_path = http://some-server/auth/user
rabbitmq_auth_backend_http.vhost_path = http://some-server/auth/vhost
@@ -741,5 +745,28 @@ tcp_listen_options.linger.timeout = 100",
{74,
"tcp_listen_options.linger.timeout = 100",
[{rabbit, [{tcp_listen_options, [{linger, {false, 100}}]}]}],
-[]}
+[]},
+
+{75,
+"autocluster.dns.hostname = 192.168.0.2.xip.io
+autocluster.node_type = disc",
+[{rabbit, [
+ {peer_discovery_dns, [{hostname, <<"192.168.0.2.xip.io">>}]},
+ {autocluster, [{node_type, disc}]}
+]}],[]}
+,
+
+{75.1,
+"autocluster.dns.hostname = 192.168.0.2.xip.io
+autocluster.node_type = disk",
+[{rabbit, [
+ {peer_discovery_dns, [{hostname, <<"192.168.0.2.xip.io">>}]},
+ {autocluster, [{node_type, disc}]}
+]}],[]}
+,
+{75.2,
+"autocluster.node_type = ram",
+[{rabbit, [
+ {autocluster, [{node_type, ram}]}
+]}],[]}
].