software/jupyter: Remove duplicate slapconfiguration

software/jupyter/buildout.hash.cfg

@@ -15,11 +15,11 @@
 
 [instance]
 filename = instance.cfg.in
-md5sum = de37ec3d4adb0be4c67bcc7397f27c91
+md5sum = 35c911edca22f847a51de164eb25a195
 
 [instance-jupyter]
 filename = instance-jupyter.cfg.in
-md5sum = cbc90e517ae3680ab8bef04c6f503af5
+md5sum = b9657b7ce75f3371981257262d6dc1e3
 
 [jupyter-notebook-config]
 filename = jupyter_notebook_config.py.jinja

software/jupyter/instance-jupyter.cfg.in

+{% set slapparameter_dict = slapconfiguration_section['configuration'] %}
 {% set additional_frontend = slapparameter_dict.get('frontend-additional-instance-guid') %}
 
 [buildout]
@@ -22,26 +23,16 @@ develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 [slapconfiguration]
-recipe = slapos.cookbook:slapconfiguration.serialised
-computer = ${slap-connection:computer-id}
-partition = ${slap-connection:partition-id}
-url = ${slap-connection:server-url}
-key = ${slap-connection:key-file}
-cert = ${slap-connection:cert-file}
+{% for k, v in slapconfiguration_section.items() -%}
+{{ k }} = {{ v }}
+{% endfor -%}
 
+[slap-parameter]
 # ERP5 URL to use in Jupyter by default
 # default value is empty - which means no default ERP5 URL
 configuration.erp5-url =
 
-[instance-parameter]
-port = 8888
-host = ${slapconfiguration:ipv6-random}
-cert_file = ${generate-certificate:cert_file}
-key_file = ${generate-certificate:key_file}
-logfile = ${directory:log}/jupyter_notebook.log
-notebook_dir = ${directory:notebook_dir}
-
-[slap-parameter]
+# Frontend default values
 frontend-software-type = RootSoftwareInstance
 frontend-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
 frontend-instance-guid =
@@ -55,6 +46,14 @@ frontend-additional-instance-name = Jupyter Frontend Additional
 {{ k }} = {{ v }}
 {% endfor -%}
 
+[instance-parameter]
+port = 8888
+host = ${slapconfiguration:ipv6-random}
+cert_file = ${generate-certificate:cert_file}
+key_file = ${generate-certificate:key_file}
+logfile = ${directory:log}/jupyter_notebook.log
+notebook_dir = ${directory:notebook_dir}
+
 [dynamic-jinja2-template-base]
 recipe = slapos.recipe.template:jinja2
 mode = 0644
@@ -199,7 +198,7 @@ rendered = ${directory:erp5_kernel_dir}/kernel.json
 context =
   raw python_executable {{ python_executable }}
   raw kernel_dir ${erp5-kernel:target-directory}/{{ erp5_kernel_filename }}
-  key erp5_url slapconfiguration:configuration.erp5-url 
+  key erp5_url slap-parameter:erp5-url
   raw display_name ERP5
   raw language_name python
 

software/jupyter/instance.cfg.in

@@ -26,7 +26,7 @@ template = ${instance-jupyter:location}/$${:filename}
 rendered = $${buildout:directory}/template.cfg
 mode = 0644
 context =
-  key slapparameter_dict slap-configuration:configuration
+  section slapconfiguration_section slap-configuration
   raw bin_directory ${buildout:bin-directory}
   raw develop_eggs_directory ${buildout:develop-eggs-directory}
   raw eggs_directory ${buildout:eggs-directory}