Commit a03ffec7 authored by Benjamin Blanc's avatar Benjamin Blanc Committed by root

Add computer_id and server_url to erp5testnode.cfg

parent afd836d9
...@@ -54,8 +54,9 @@ class Recipe(GenericBaseRecipe): ...@@ -54,8 +54,9 @@ class Recipe(GenericBaseRecipe):
if software_path_list: if software_path_list:
CONFIG["software_path_list"] = "[software_list]" CONFIG["software_path_list"] = "[software_list]"
CONFIG["software_path_list"] += \ CONFIG["software_path_list"] += \
"\npath_list = %s" % ",".join(software_path_list) "\npath_list = %s" % ",".join(software_path_list)
CONFIG['computer_id'] = self.buildout['slap-connection']['computer-id']
CONFIG['server_url'] = self.buildout['slap-connection']['server-url']
configuration_file = self.createFile( configuration_file = self.createFile(
self.options['configuration-file'], self.options['configuration-file'],
self.substituteTemplate( self.substituteTemplate(
...@@ -107,4 +108,4 @@ class Recipe(GenericBaseRecipe): ...@@ -107,4 +108,4 @@ class Recipe(GenericBaseRecipe):
# create empty html page to not allow listing of / # create empty html page to not allow listing of /
page = open(os.path.join(self.options['log-directory'], "index.html"), "w") page = open(os.path.join(self.options['log-directory'], "index.html"), "w")
page.write("<html/>") page.write("<html/>")
page.close() page.close()
\ No newline at end of file
...@@ -13,6 +13,8 @@ ipv6_address = %(ipv6_address)s ...@@ -13,6 +13,8 @@ ipv6_address = %(ipv6_address)s
test_suite_master_url = %(test_suite_master_url)s test_suite_master_url = %(test_suite_master_url)s
httpd_ip = %(httpd_ip)s httpd_ip = %(httpd_ip)s
httpd_port = %(httpd_port)s httpd_port = %(httpd_port)s
computer_id = %(computer_id)s
server_url = %(server_url)s
# Binaries # Binaries
git_binary = %(git_binary)s git_binary = %(git_binary)s
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment