correctly pass httpd ip and port to testnode

slapos/recipe/erp5testnode/__init__.py

@@ -85,8 +85,8 @@ class Recipe(GenericBaseRecipe):
     apache_config = dict(
         pid_file=self.options['httpd-pid-file'],
         lock_file=self.options['httpd-lock-file'],
-        ip=self.options['ipv6-address'],
-        port='9080',
+        ip=self.options['httpd-ip'],
+        port=self.options['httpd-port'],
         error_log=os.path.join(self.options['httpd-log-directory'],
                                'httpd-error.log'),
         access_log=os.path.join(self.options['httpd-log-directory'],

slapos/recipe/erp5testnode/template/erp5testnode.cfg.in

@@ -11,6 +11,8 @@ test_node_title = %(test_node_title)s
 ipv4_address = %(ipv4_address)s
 ipv6_address = %(ipv6_address)s
 test_suite_master_url = %(test_suite_master_url)s
+httpd_ip = %(httpd_ip)s
+httpd_port = %(httpd_port)s
 
 # Binaries
 git_binary = %(git_binary)s

software/erp5testnode/instance-default.cfg

@@ -51,6 +51,8 @@ httpd-pid-file = $${basedirectory:run}/httpd.pid
 httpd-lock-file = $${basedirectory:run}/httpd.lock
 httpd-conf-file = $${rootdirectory:etc}/httpd.conf
 httpd-wrapper = $${rootdirectory:bin}/httpd
+httpd-port = 9080
+httpd-ip = $${slap-network-information:global-ipv6}
 httpd-log-directory = $${basedirectory:log}
 httpd-cert-file = $${rootdirectory:etc}/httpd-public.crt
 httpd-key-file = $${rootdirectory:etc}/httpd-private.key

software/erp5testnode/software.cfg

@@ -79,7 +79,7 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-default.cfg
 output = ${buildout:directory}/template-default.cfg
 mode = 0644
-md5sum = ea103e4b563cf3ab88614fa19249359d
+md5sum = d3e590a476b436e54f272303bdbea23a
 
 [networkcache]
 # signature certificates of the following uploaders.