This commit is contained in:
Yatsishin Ilya 2020-08-19 10:45:16 +03:00
parent 26020cdf68
commit e77ab608c8

View File

@ -17,12 +17,12 @@ class ClickHouseClusterWithDDLHelpers(ClickHouseCluster):
def prepare(self, replace_hostnames_with_ips=True):
try:
main_configs_files = ["clusters.xml", "zookeeper_session_timeout.xml", "macro.xml",
"query_log.xml","ddl.xml"]
main_configs_files = ["clusters.xml", "zookeeper_session_timeout.xml", "macro.xml", "query_log.xml","ddl.xml"]
main_configs = [os.path.join(self.test_config_dir, "config.d", f) for f in main_configs_files]
user_configs = [os.path.join(self.test_config_dir, "users.d", f) for f in ["restricted_user.xml", "query_log.xml"]]
if self.test_config_dir == "configs_secure":
main_configs += [os.path.join(self.test_config_dir, f) for i in ["server.crt", "server.key", "dhparam.pem", "config.d/ssl_conf.xml"]]
main_configs += [os.path.join(self.test_config_dir, f) for f in ["server.crt", "server.key", "dhparam.pem", "config.d/ssl_conf.xml"]]
for i in xrange(4):
self.add_instance(
'ch{}'.format(i+1),