Commit 50a885d7 authored by Sebastian's avatar Sebastian

instance_erp5: Add instance parameter pass-through for jupyter jiocontents parameter

parent 05135d13
...@@ -79,7 +79,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e ...@@ -79,7 +79,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
[template-erp5] [template-erp5]
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = 14ec590eaaebc90113f1c589ea8dd444 md5sum = 2a5a8342eb403630372830fe5d19355e
[template-zeo] [template-zeo]
filename = instance-zeo.cfg.in filename = instance-zeo.cfg.in
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
{% set jupyter_dict = slapparameter_dict.get('jupyter', {}) -%} {% set jupyter_dict = slapparameter_dict.get('jupyter', {}) -%}
{% set has_jupyter = jupyter_dict.get('enable', jupyter_enable_default.lower() in ('true', 'yes')) -%} {% set has_jupyter = jupyter_dict.get('enable', jupyter_enable_default.lower() in ('true', 'yes')) -%}
{% set jupyter_zope_family = jupyter_dict.get('zope-family', '') -%} {% set jupyter_zope_family = jupyter_dict.get('zope-family', '') -%}
{% set jupyter_hateoas_url = jupyter_dict.get('erp5-hateoas-url', '') -%}
[request-common] [request-common]
<= request-common-base <= request-common-base
config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }} config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }}
...@@ -216,7 +217,8 @@ config-url = ${request-balancer:connection-{{ family_name }}-v6} ...@@ -216,7 +217,8 @@ config-url = ${request-balancer:connection-{{ family_name }}-v6}
{% if has_jupyter -%} {% if has_jupyter -%}
{# request jupyter connected to balancer of proper zope family -#} {# request jupyter connected to balancer of proper zope family -#}
{{ request('jupyter', 'jupyter', 'jupyter', {}, key_config={'erp5-url': 'request-balancer:connection-' ~ jupyter_zope_family}) }} {{ request('jupyter', 'jupyter', 'jupyter', { 'erp5-hateoas-url': jupyter_hateoas_url }, key_config={'erp5-url': 'request-balancer:connection-' ~ jupyter_zope_family }) }}
#{{ request('jupyter', 'jupyter', 'jupyter', {}, key_config={'erp5-url': 'request-balancer:connection-' ~ jupyter_zope_family }) }}
{% if has_frontend -%} {% if has_frontend -%}
[frontend-jupyter] [frontend-jupyter]
......
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