fix list of image to wipe, fix empty parameter break slapconfiguration

software/kvm/common.cfg

@@ -98,7 +98,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
 mode = 644
-md5sum = 4c434dfbf3ead1931c03f1cff4f17095
+md5sum = 9428455f2684b4db676cc9283b5c3d15
 download-only = true
 on-update = true
 
@@ -107,7 +107,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
 mode = 644
-md5sum = 7564496147a0e3b8a9f07dc794799a92
+md5sum = e2efbf1599d5637a3fac0d9f21cca937
 download-only = true
 on-update = true
 

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

@@ -11,6 +11,13 @@
 {% set monitor_url_list = [] -%}
 {% set enable_monitoring = slapparameter_dict.get('enable-monitor', True) -%}
 
+{% macro setconfig(name, value) -%}
+{# will set a config-name = value if value is not empty -#}
+{% if value and value != '' -%}
+config-{{ name }} = {{ dumps(value) }}
+{% endif -%}
+{% endmacro -%}
+
 [request-common]
 recipe = slapos.cookbook:request
 software-url = ${slap-connection:software-release-url}
@@ -37,36 +44,36 @@ state = stopped
 config-frontend-instance-name = {{ instance_name ~ ' VNC Frontend' }}
 config-frontend-software-type = {{ dumps(frontend_dict.get('software-type', 'frontend')) }}
 config-frontend-software-url = {{ dumps(frontend_dict.get('software-url', 'http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg')) }}
-config-frontend-instance-guid = {{ dumps(frontend_dict.get('instance-guid', '')) }}
+{{ setconfig('instance-guid', kvm_parameter_dict.get('instance-guid', '')) }}
 config-name = {{ instance_name }}
 {% if slapparameter_dict.get('authorized-keys', []) -%}
 config-authorized-key = {{ dumps(slapparameter_dict.get('authorized-keys') | join('\n')) }}
 {% endif -%}
 config-nbd-port = {{ dumps(kvm_parameter_dict.get('nbd-port', 1024)) }}
-config-nbd-host = {{ dumps(kvm_parameter_dict.get('nbd-host', '')) }}
 config-nbd2-port = {{ dumps(kvm_parameter_dict.get('nbd-port2', 1024)) }}
-config-nbd2-host = {{ dumps(kvm_parameter_dict.get('nbd-host2', '')) }}
 config-ram-size = {{ dumps(kvm_parameter_dict.get('ram-size', 1024)) }}
 config-disk-size = {{ dumps(kvm_parameter_dict.get('disk-size', 10)) }}
 config-disk-type = {{ dumps(kvm_parameter_dict.get('disk-type', 'virtio')) }}
 config-cpu-count = {{ dumps(kvm_parameter_dict.get('cpu-count', 1)) }}
-config-cpu-options = {{ dumps(kvm_parameter_dict.get('cpu-options', '')) }}
-config-numa = {{ dumps(kvm_parameter_dict.get('numa', '')) }}
-config-disk-cache = {{ dumps(kvm_parameter_dict.get('disk-cache', '')) }}
-config-disk-aio = {{ dumps(kvm_parameter_dict.get('disk-aio', '')) }}
+{{ setconfig('cpu-options', kvm_parameter_dict.get('cpu-options', '')) }}
+{{ setconfig('nbd-host', kvm_parameter_dict.get('nbd-host', '')) }}
+{{ setconfig('host2', kvm_parameter_dict.get('host2', '')) }}
+
 config-auto-ballooning = {{ dumps(kvm_parameter_dict.get('auto-ballooning', True)) }}
-config-machine-options = {{ dumps(kvm_parameter_dict.get('machine-options', '')) }}
-config-cpu-model = {{ dumps(kvm_parameter_dict.get('cpu-model', '')) }}
+{{ setconfig('disk-cache', kvm_parameter_dict.get('disk-cache', '')) }}
+{{ setconfig('disk-aio', kvm_parameter_dict.get('disk-aio', '')) }}
+{{ setconfig('cpu-model', kvm_parameter_dict.get('cpu-model', '')) }}
+{{ setconfig('disk-cache', kvm_parameter_dict.get('disk-cache', '')) }}
 
 {% set nat_rules_list = kvm_parameter_dict.get('nat-rules', []) -%}
-config-nat-rules = {{ nat_rules_list | join(' ') }}
+{{ setconfig('nat-rules', ' '.join(nat_rules_list)) }}
 config-publish-nat-url = True
 config-use-nat = {{ use_nat }}
 config-use-tap = {{ dumps(kvm_parameter_dict.get('use-tap', True)) }}
 config-nat-restrict-mode = {{ dumps(kvm_parameter_dict.get('nat-restrict-mode', False)) }}
 config-enable-vhost = {{ dumps(kvm_parameter_dict.get('enable-vhost', False)) }}
-config-virtual-hard-drive-url = {{ dumps(kvm_parameter_dict.get('virtual-hard-drive-url', '')) }}
-config-virtual-hard-drive-md5sum = {{ dumps(kvm_parameter_dict.get('virtual-hard-drive-md5sum', '')) }}
+{{ setconfig('virtual-hard-drive-url', kvm_parameter_dict.get('virtual-hard-drive-url', '')) }}
+{{ setconfig('virtual-hard-drive-md5sum', kvm_parameter_dict.get('virtual-hard-drive-md5sum', '')) }}
 config-virtual-hard-drive-gzipped = {{ dumps(kvm_parameter_dict.get('virtual-hard-drive-gzipped', False)) }}
 config-hard-drive-url-check-certificate = {{ dumps(kvm_parameter_dict.get('hard-drive-url-check-certificate', True)) }}
 config-external-disk-number = {{ dumps(kvm_parameter_dict.get('external-disk-number', 0)) }}
@@ -74,9 +81,9 @@ config-external-disk-size = {{ dumps(kvm_parameter_dict.get('external-disk-size'
 config-external-disk-format = {{ dumps(kvm_parameter_dict.get('external-disk-format', 'qcow2')) }}
 config-enable-http-server = {{ dumps(kvm_parameter_dict.get('enable-http-server', True)) }}
 config-httpd-port = {{ dumps(kvm_parameter_dict.get('httpd-port', 8081)) }}
-{% if kvm_parameter_dict.get('data-to-vm', '') -%}
-config-data-to-vm = {{ dumps(kvm_parameter_dict.get('data-to-vm', '')) }}
-{% endif -%}
+
+{{ setconfig('data-to-vm', kvm_parameter_dict.get('data-to-vm', '')) }}
+
 config-disable-ansible-promise = {{ dumps(kvm_parameter_dict.get('disable-ansible-promise', False)) }}
 config-enable-monitor = {{ enable_monitoring }}
 config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
@@ -155,7 +162,7 @@ name = Frontend {{ name }}
 software-type = {{ slave_frontend_stype }}
 slave = true
 config-url = {{ url }}
-config-custom_domain = {{ dumps(frontend_parameter_dict.get('domain', '')) }}
+{{ setconfig('domain', kvm_parameter_dict.get('domain', '')) }}
 config-enable_cache = {{ dumps(frontend_parameter_dict.get('enable-cache', False)) }}
 config-https-only = {{ dumps(frontend_parameter_dict.get('https-only', False)) }}
 {%  if frontend_parameter_dict.get('type', '') -%}

software/kvm/instance-kvm.cfg.jinja2

@@ -43,7 +43,7 @@ services = ${:etc}/service
 promises = ${:etc}/promise
 novnc-conf = ${:etc}/novnc
 run = ${:var}/run
-wipe = ${:run}/slapos/pre-destroy
+prerm = ${:etc}/prerm
 ca-dir = ${:srv}/ssl
 public = ${:srv}/public/
 cron-entries = ${:etc}/cron.d
@@ -224,12 +224,12 @@ mode = 700
 {% if wipe_disk == 'true' -%}
 {% do part_list.append('wipe-disk-wrapper') -%}
 {% set wipe_file_list = '${kvm-parameter-dict:disk-path}' -%}
-{% for key, path in storage_dict.items() -%}
-{%   set wipe_file_list  = wipe_file_list  ~ ' ' ~ path ~ '/*' -%}
-{% endfor -%}
+{% if storage_dict -%}
+{% set wipe_file_list = '${kvm-parameter-dict:disk-path}' ~ ' ' ~ '/* '.join(storage_dict.values()) ~ '/*' -%}
+{% endif -%}
 [wipe-disk-wrapper]
 recipe = slapos.cookbook:wrapper
-wrapper-path = ${directory:wipe}/slapos_wipe_qemu_disk
+wrapper-path = ${directory:prerm}/slapos_wipe_qemu_disk
 command-line = 
   {{ wipe_disk_wrapper }} -n {{ slapparameter_dict.get('wipe-disk-iterations', 1) }} -suz --check-pid-file ${kvm-parameter-dict:pid-file-path} --file {{ wipe_file_list }}
 {% endif -%}