Fix/kvm passed parameter

See merge request !950

software/kvm/buildout.hash.cfg

@@ -19,11 +19,11 @@ md5sum = e6d5c7bb627b4f1d3e7c99721b7c58fe
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
-md5sum = 31b17b55200ea065cb97085283ef5568
+md5sum = 89796d6d6a25f694291f9b45181830ad
 
 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in
-md5sum = 28a00c28a972f42627849b25c2792abb
+md5sum = 8a6c5555efd63ac7d471b8fdabb69f7e
 
 [template-kvm-resilient]
 filename = instance-kvm-resilient.cfg.jinja2
@@ -31,7 +31,7 @@ md5sum = 7de5756f59ef7d823cd8ed33e6d15230
 
 [template-kvm-import]
 filename = instance-kvm-import.cfg.jinja2.in
-md5sum = bd7e5db872b0dbe7716ec49c3907c401
+md5sum = 3e7ff2ba85762ca47b5f90495d492570
 
 [template-kvm-import-script]
 filename = template/kvm-import.sh.jinja2
@@ -39,7 +39,7 @@ md5sum = cd0008f1689dfca9b77370bc4d275b70
 
 [template-kvm-export]
 filename = instance-kvm-export.cfg.jinja2
-md5sum = f12df4256eb5bd31a01c0ddc4b3897bb
+md5sum = c15f7600389b0c641622fcfdc42260d8
 
 [template-kvm-export-script]
 filename = template/kvm-export.sh.jinja2

software/kvm/instance-kvm-cluster.cfg.jinja2.in

@@ -24,7 +24,7 @@ global-ipv6 = {{ ipv6 }}
 
 [slap-parameter]
 {% for k, v in slapparameter_dict.items() -%}
-{{ k }} = {{ v }}
+{{ k }} = {{ dumps(v) }}
 {% endfor -%}
 
 [request-common]
@@ -135,14 +135,13 @@ config-document-host = ${apache-conf:ip}
 config-document-port = ${apache-conf:port}
 config-document-path = ${hash-code:passwd}
 config-keyboard-layout-language = {{ dumps(kvm_parameter_dict.get('keyboard-layout-language', 'fr')) }}
-{%- if 'boot-image-url-list' in kvm_parameter_dict %}
-{#- play nice: if parameter was not constructed by the original request, do not send it at all #}
-config-boot-image-url-list = {{ kvm_parameter_dict['boot-image-url-list'] }}
-{%- endif %}
-{%- if 'boot-image-url-select' in kvm_parameter_dict %}
-{#- play nice: if parameter was not constructed by the original request, do not send it at all #}
-config-boot-image-url-select = {{ kvm_parameter_dict['boot-image-url-select'] }}
+{%- for k in ['boot-image-url-list', 'boot-image-url-select'] %}
+{#-   play nice - use parameter only if present #}
+{%-   if k in kvm_parameter_dict %}
+{#-     play safe - dumps value #}
+config-{{ k }} = {{ dumps(kvm_parameter_dict[k]) }}
 {%-   endif %}
+{%- endfor %}
 config-type = cluster
 
 {% set bootstrap_script_url = slapparameter_dict.get('bootstrap-script-url', kvm_parameter_dict.get('bootstrap-script-url', '')) -%}

software/kvm/instance-kvm-export.cfg.jinja2

@@ -5,24 +5,11 @@ extends =
 
 parts +=
   cron-entry-backup
-
-  certificate-authority
-  certificate-authority-service
-  publish-connection-information
-  kvm-vnc-promise
-  kvm-disk-image-corruption-promise
-  websockify-sighandler
-  websockify-sighandler-service
-  novnc-promise
-  cron
-  cron-service
-  frontend-promise
-# monitor parts
-  monitor-base
+  ${instance-kvm-parts:parts}
 
 [slap-parameter]
 {% for k, v in slapparameter_dict.items() -%}
-{{ k }} = {{ v }}
+{{ k }} = {{ dumps(v) }}
 {% endfor -%}
 
 # Create the exporter executable, which is a simple shell script

software/kvm/instance-kvm-import.cfg.jinja2.in

@@ -14,7 +14,7 @@ extends =
 
 [slap-parameter]
 {% for k, v in slapparameter_dict.items() -%}
-{{ k }} = {{ v }}
+{{ k }} = {{ dumps(v) }}
 {% endfor -%}
 
 [resilient-publish-connection-parameter]

software/kvm/instance-kvm.cfg.jinja2

+{# Workaround empty parameter passing #}
+{# In case of resilient '' is converted to 'None' string, but with slapproxy '' becomes None #}
+{% for k, v in slapparameter_dict.items() %}
+{%   if v == 'None' or v is none %}
+{%     do slapparameter_dict.__setitem__(k, '') %}
+{%   endif %}
+{% endfor %}
 {% set additional_frontend = slapparameter_dict.get('frontend-additional-instance-guid') %}
 {% set enable_http = str(slapparameter_dict.get('enable-http-server', False)).lower() == 'true' -%}
 {% set use_tap = str(slapparameter_dict.get('use-tap', True)).lower() == 'true' -%}
@@ -92,22 +99,14 @@ config-state = empty
 config-url = ${monitor-base:base-url}/private/boot-image-url-select/${:filename} with username ${monitor-publish-parameters:monitor-user} and password ${monitor-publish-parameters:monitor-password}
 
 [boot-image-url-select-source-config]
-# generates configuration of the image from the user parameter
-# special "magic" is used, to properly support multiline boot-image-url-select
-# but in the same time correctly generate the configuration file
 recipe = slapos.recipe.template:jinja2
 template = inline:
-{#- Do special trick to support boot-image-url-select being None, if key is present with value "" #}
 {%- raw %}
-  {%- set boot_image_url_select = slap_parameter.get('boot-image-url-select') or '' %}
-  {%- if boot_image_url_select == 'None' %}
-  {#- That's insane protection, is it 'None' because of type = array? #}
-  {%-   set boot_image_url_select = '' %}
-  {%- endif %}
   {{ boot_image_url_select }}
 {% endraw -%}
+boot-image-url-select = {{ dumps(slapparameter_dict['boot-image-url-select']) }}
 context =
-  section slap_parameter slap-parameter
+  key boot_image_url_select :boot-image-url-select
 rendered = ${directory:etc}/boot-image-url-select.json
 
 [boot-image-url-select-processed-config]
@@ -199,17 +198,14 @@ config-state = empty
 config-url = ${monitor-base:base-url}/private/boot-image-url-list/${:filename} with username ${monitor-publish-parameters:monitor-user} and password ${monitor-publish-parameters:monitor-password}
 
 [boot-image-url-list-source-config]
-# generates configuration of the image from the user parameter
-# special "magic" is used, to properly support multiline boot-image-url-list
-# but in the same time correctly generate the configuration file
 recipe = slapos.recipe.template:jinja2
 template = inline:
-{#- Do special trick to support boot-image-url-list being None, if key is present with value "" #}
 {%- raw %}
-  {{ slap_parameter.get('boot-image-url-list') or '' }}
+  {{ boot_image_url_list }}
 {% endraw -%}
+boot-image-url-list = {{ dumps(slapparameter_dict['boot-image-url-list']) }}
 context =
-  section slap_parameter slap-parameter
+  key boot_image_url_list :boot-image-url-list
 rendered = ${directory:etc}/boot-image-url-list.conf
 
 [boot-image-url-list-processed-config]
@@ -976,7 +972,7 @@ keyboard-layout-language = fr
 {% set key_list =  v.split('\n') -%}
 {{ k }} =
   {{ key_list | join('\n  ') }}
-{% elif k == 'boot-image-url-list' %}
+{% elif k in ['boot-image-url-list', 'boot-image-url-select'] %}
 {# needs to decorate possibly multiline or maybe unsafe value #}
 {{ k }} = {{ dumps(v) }}
 {% else -%}
@@ -1042,7 +1038,8 @@ command-line =
 
 {% endif -%}
 
-[buildout]
+[instance-kvm-parts]
+# Expose parts for easy addition in profiles which extend this one like resilient
 parts =
   certificate-authority
   certificate-authority-service
@@ -1081,6 +1078,9 @@ parts =
 # Complete parts with sections
   {{ part_list | join('\n  ') }}
 
+[buildout]
+parts = ${instance-kvm-parts:parts}
+
 extends =
 #  Add extends list
  {{ extends_list | join('\n  ') }}