Commit f01b2aa4 authored by Łukasz Nowak's avatar Łukasz Nowak

XXX recursively set defaults

parent 95b08d34
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# not need these here). # not need these here).
[template] [template]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = cc5235722643381092f54e610947caed md5sum = ea2edd5496ccc65a729a00a8f792ab28
[profile-common] [profile-common]
filename = instance-common.cfg.in filename = instance-common.cfg.in
...@@ -22,7 +22,7 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68 ...@@ -22,7 +22,7 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
[profile-frontend] [profile-frontend]
filename = instance-frontend.cfg.in filename = instance-frontend.cfg.in
md5sum = 00b7120eb652e6e4d04046591b156e31 md5sum = d9083426d271c51edb0ddaf3b335b4f5
[profile-master] [profile-master]
filename = instance-master.cfg.in filename = instance-master.cfg.in
......
{% import "caucase" as caucase with context %} {% import "caucase" as caucase with context %}
{%- do instance_parameter_dict['configuration'].setdefault('user', {}) %} {%- do instance_parameter_dict['configuration'].setdefault('user', {}) %}
{%- do instance_parameter_dict['configuration']['user'].update(FRONTEND_USER_DEFAULTS) %} {%- do instance_parameter_dict['configuration']['user'].update(FRONTEND_USER_DEFAULTS) %}
{%- do instance_parameter_dict['configuration']['user']['global'].update(FRONTEND_GLOBAL_DEFAULTS) %}
{%- set HTTP3_PORT = instance_parameter_dict['configuration']['user']['global']['expert']['advertised-http3-port'] %} {%- set HTTP3_PORT = instance_parameter_dict['configuration']['user']['global']['expert']['advertised-http3-port'] %}
{%- set FRONTEND_HTTP3 = instance_parameter_dict['configuration']['user']['global']['enable-http3'] %} {%- set FRONTEND_HTTP3 = instance_parameter_dict['configuration']['user']['global']['enable-http3'] %}
{%- if FRONTEND_HTTP3 %} {%- if FRONTEND_HTTP3 %}
......
...@@ -80,14 +80,14 @@ input = {{ software_parameter_dict['instance_slave_input_schema'] }} ...@@ -80,14 +80,14 @@ input = {{ software_parameter_dict['instance_slave_input_schema'] }}
[instance-frontend-user-default] [instance-frontend-user-default]
<= schema-json-to-default <= schema-json-to-default
input = {{ software_parameter_dict['instance_frontend_user_input_schema'] }} input = {{ software_parameter_dict['instance_frontend_user_input_schema'] }}
input-mapping =
[instance-frontend-global-default] ./instance-frontend-global-input-schema.json {{ software_parameter_dict['instance_frontend_global_input_schema'] }}
<= schema-json-to-default
input = {{ software_parameter_dict['instance_frontend_global_input_schema'] }}
[instance-default] [instance-default]
<= schema-json-to-default <= schema-json-to-default
input = {{ software_parameter_dict['instance_input_schema'] }} input = {{ software_parameter_dict['instance_input_schema'] }}
input-mapping =
./instance-frontend-global-input-schema.json {{ software_parameter_dict['instance_frontend_global_input_schema'] }}
[dynamic-profile-frontend] [dynamic-profile-frontend]
< = jinja2-template-base < = jinja2-template-base
...@@ -98,7 +98,6 @@ extra-context = ...@@ -98,7 +98,6 @@ extra-context =
raw software_type single-custom-personal raw software_type single-custom-personal
key SLAVE_DEFAULTS instance-slave-default:defaults key SLAVE_DEFAULTS instance-slave-default:defaults
key FRONTEND_USER_DEFAULTS instance-frontend-user-default:defaults key FRONTEND_USER_DEFAULTS instance-frontend-user-default:defaults
key FRONTEND_GLOBAL_DEFAULTS instance-frontend-global-default:defaults
[dynamic-profile-master] [dynamic-profile-master]
< = jinja2-template-base < = jinja2-template-base
...@@ -113,7 +112,6 @@ extra-context = ...@@ -113,7 +112,6 @@ extra-context =
import software_module software import software_module software
key CLUSTER_DEFAULTS instance-default:defaults key CLUSTER_DEFAULTS instance-default:defaults
key FRONTEND_USER_DEFAULTS instance-frontend-user-default:defaults key FRONTEND_USER_DEFAULTS instance-frontend-user-default:defaults
key FRONTEND_GLOBAL_DEFAULTS instance-frontend-global-default:defaults
key SLAVE_DEFAULTS instance-slave-default:defaults key SLAVE_DEFAULTS instance-slave-default:defaults
[dynamic-profile-kedifa] [dynamic-profile-kedifa]
......
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