diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-11-03 09:15:47 +0000 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-11-03 09:15:47 +0000 |
| commit | cd9da9fe1ca76eaec2d72afb402ff5c2afefaaa2 (patch) | |
| tree | 889ea639764f72f89194b5d2134b6db67ff79fd7 /test | |
| parent | 672d0c156b036047010feda8ba787bbad4c699e9 (diff) | |
| download | rabbitmq-server-git-cd9da9fe1ca76eaec2d72afb402ff5c2afefaaa2.tar.gz | |
Introduce autocluster.peer_discovery_backend
If it's not configured, don't generate autocluster.node_type.
Diffstat (limited to 'test')
| -rw-r--r-- | test/config_schema_SUITE_data/snippets.config | 48 |
1 files changed, 26 insertions, 22 deletions
diff --git a/test/config_schema_SUITE_data/snippets.config b/test/config_schema_SUITE_data/snippets.config index 114c931622..a64b6e06c9 100644 --- a/test/config_schema_SUITE_data/snippets.config +++ b/test/config_schema_SUITE_data/snippets.config @@ -94,28 +94,30 @@ default_permissions.write = .*", {default_permissions, [<<".*">>, <<".*">>, <<".*">>]}]}],[]} , {13, -"autocluster.classic_config.nodes.peer1 = rabbit@hostname1 +"autocluster.peer_discovery_backend = rabbit_peer_discovery_classic_config +autocluster.classic_config.nodes.peer1 = rabbit@hostname1 autocluster.classic_config.nodes.peer2 = rabbit@hostname2 autocluster.node_type = disc", [{rabbit, [ - {autocluster, [{node_type, disc}]}, + {autocluster, [{peer_discovery_backend, rabbit_peer_discovery_classic_config}, + {node_type, disc}]}, {cluster_nodes, {[rabbit@hostname2,rabbit@hostname1], disc}} ]}],[]} , {13.1, -"autocluster.classic_config.nodes.peer1 = rabbit@hostname1 +"autocluster.peer_discovery_backend = rabbit_peer_discovery_classic_config +autocluster.classic_config.nodes.peer1 = rabbit@hostname1 autocluster.classic_config.nodes.peer2 = rabbit@hostname2 autocluster.node_type = disk", [{rabbit, [ - {autocluster, [{node_type, disc}]}, + {autocluster, [{peer_discovery_backend, rabbit_peer_discovery_classic_config}, + {node_type, disc}]}, {cluster_nodes, {[rabbit@hostname2,rabbit@hostname1], disc}} ]}],[]} , {13.2, "autocluster.node_type = ram", -[{rabbit, [ - {autocluster, [{node_type,ram}]} -]}],[]} +[],[]} , {14, "tcp_listen_options.backlog = 128 @@ -746,27 +748,29 @@ tcp_listen_options.linger.timeout = 100", "tcp_listen_options.linger.timeout = 100", [{rabbit, [{tcp_listen_options, [{linger, {false, 100}}]}]}], []}, - {75, -"autocluster.dns.hostname = 192.168.0.2.xip.io +" +autocluster.peer_discovery_backend = rabbit_peer_discovery_dns +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}]} + {autocluster, [{peer_discovery_dns, [{hostname, <<"192.168.0.2.xip.io">>}]}, + {peer_discovery_backend, rabbit_peer_discovery_dns}, + {node_type, disc}]} ]}],[]} , - -{75.1, -"autocluster.dns.hostname = 192.168.0.2.xip.io -autocluster.node_type = disk", +{76, +"autocluster.peer_discovery_backend = rabbit_peer_discovery_classic_config +autocluster.node_type = disc", [{rabbit, [ - {peer_discovery_dns, [{hostname, <<"192.168.0.2.xip.io">>}]}, - {autocluster, [{node_type, disc}]} -]}],[]} -, -{75.2, -"autocluster.node_type = ram", + {autocluster, [{peer_discovery_backend, rabbit_peer_discovery_classic_config}, + {node_type, disc}]} +]}],[]}, +{76.1, +"autocluster.peer_discovery_backend = rabbit_peer_discovery_classic_config +autocluster.node_type = ram", [{rabbit, [ - {autocluster, [{node_type, ram}]} + {autocluster, [{peer_discovery_backend, rabbit_peer_discovery_classic_config}, + {node_type, ram}]} ]}],[]} ]. |