diff options
| author | Eric Hartmann <hartmann.eric@gmail.com> | 2017-08-16 18:04:18 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2017-09-05 14:24:13 +0200 |
| commit | d63783420e7d1789f3dfe15ae1100ad2f4e7a510 (patch) | |
| tree | 1b35442be7158972d8d7325c42c1e7a36664f05f /tests/src/test/java/org | |
| parent | fa97b5981a4bf8511f285577b5623c07e5130216 (diff) | |
| download | sonarqube-d63783420e7d1789f3dfe15ae1100ad2f4e7a510.tar.gz sonarqube-d63783420e7d1789f3dfe15ae1100ad2f4e7a510.zip | |
SONAR-9731 Update clustering property names
Diffstat (limited to 'tests/src/test/java/org')
| -rw-r--r-- | tests/src/test/java/org/sonarqube/tests/cluster/Cluster.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/src/test/java/org/sonarqube/tests/cluster/Cluster.java b/tests/src/test/java/org/sonarqube/tests/cluster/Cluster.java index 3fd8aa7627e..cf81dd3342c 100644 --- a/tests/src/test/java/org/sonarqube/tests/cluster/Cluster.java +++ b/tests/src/test/java/org/sonarqube/tests/cluster/Cluster.java @@ -46,13 +46,11 @@ import static org.sonarqube.tests.cluster.Cluster.NodeType.SEARCH; public class Cluster { protected static final String CLUSTER_ENABLED = "sonar.cluster.enabled"; - protected static final String CLUSTER_CE_DISABLED = "sonar.cluster.ce.disabled"; - protected static final String CLUSTER_SEARCH_DISABLED = "sonar.cluster.search.disabled"; + protected static final String CLUSTER_NODE_TYPE = "sonar.cluster.node.type"; protected static final String CLUSTER_SEARCH_HOSTS = "sonar.cluster.search.hosts"; - protected static final String CLUSTER_WEB_DISABLED = "sonar.cluster.web.disabled"; protected static final String CLUSTER_HOSTS = "sonar.cluster.hosts"; - protected static final String CLUSTER_PORT = "sonar.cluster.port"; - protected static final String CLUSTER_NETWORK_INTERFACES = "sonar.cluster.networkInterfaces"; + protected static final String CLUSTER_NODE_PORT = "sonar.cluster.node.port"; + protected static final String CLUSTER_NODE_HOST = "sonar.cluster.node.host"; protected static final String CLUSTER_NAME = "sonar.cluster.name"; protected static final String SEARCH_HOST = "sonar.search.host"; @@ -176,9 +174,9 @@ public class Cluster { nodes.forEach( node -> { - node.addProperty(CLUSTER_NETWORK_INTERFACES, inet); + node.addProperty(CLUSTER_NODE_HOST, inet); node.addProperty(CLUSTER_HOSTS, clusterHosts); - node.addProperty(CLUSTER_PORT, Integer.toString(node.getHzPort() == null ? -1 : node.getHzPort())); + node.addProperty(CLUSTER_NODE_PORT, Integer.toString(node.getHzPort() == null ? -1 : node.getHzPort())); node.addProperty(CLUSTER_SEARCH_HOSTS, elasticsearchHosts); node.addProperty(SEARCH_PORT, Integer.toString(node.getEsPort() == null ? -1 : node.getEsPort())); node.addProperty(SEARCH_HOST, inet); |