Merge remote-tracking branch 'origin/master'

elastic · Mar 2, 2023 · bd90820 · bd90820
2 parents fc6d3b8 + 08d5976
commit bd90820
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/esrally/mechanic/provisioner.py b/esrally/mechanic/provisioner.py
@@ -319,7 +319,6 @@ def variables(self):
             "transport_port": str(self.http_port + 100),
             "all_node_ips": '["%s"]' % '","'.join(self.all_node_ips),
             "all_node_names": '["%s"]' % '","'.join(self.all_node_names),
-            "all_node_ips_count": len(self.all_node_ips),
             # at the moment we are strict and enforce that all nodes are master eligible nodes
             "minimum_master_nodes": len(self.all_node_ips),
             "install_root_path": self.es_home_path,

diff --git a/tests/mechanic/provisioner_test.py b/tests/mechanic/provisioner_test.py
@@ -88,7 +88,6 @@ def null_apply_config(source_root_path, target_root_path, config_vars):
             "transport_port": "9300",
             "all_node_ips": '["10.17.22.22","10.17.22.23"]',
             "all_node_names": '["rally-node-0","rally-node-1"]',
-            "all_node_ips_count": 2,
             "minimum_master_nodes": 2,
             "install_root_path": "/opt/elasticsearch-5.0.0",
         }
@@ -210,7 +209,6 @@ def null_apply_config(source_root_path, target_root_path, config_vars):
             "transport_port": "9300",
             "all_node_ips": '["10.17.22.22","10.17.22.23"]',
             "all_node_names": '["rally-node-0","rally-node-1"]',
-            "all_node_ips_count": 2,
             "minimum_master_nodes": 2,
             "install_root_path": "/opt/elasticsearch-6.8.0",
             "plugin_name": "x-pack-security",
@@ -326,7 +324,6 @@ def test_prepare_default_data_paths(self, mock_rm, mock_ensure_dir, mock_decompr
             "transport_port": "9300",
             "all_node_ips": '["10.17.22.22","10.17.22.23"]',
             "all_node_names": '["rally-node-0","rally-node-1"]',
-            "all_node_ips_count": 2,
             "minimum_master_nodes": 2,
             "install_root_path": "/install/elasticsearch-5.0.0-SNAPSHOT",
         }
@@ -372,7 +369,6 @@ def test_prepare_user_provided_data_path(self, mock_rm, mock_ensure_dir, mock_de
             "transport_port": "9300",
             "all_node_ips": '["10.17.22.22","10.17.22.23"]',
             "all_node_names": '["rally-node-0","rally-node-1"]',
-            "all_node_ips_count": 2,
             "minimum_master_nodes": 2,
             "install_root_path": "/install/elasticsearch-5.0.0-SNAPSHOT",
         }