diff --git a/software/kvm/buildout.hash.cfg b/software/kvm/buildout.hash.cfg index 099ce688580792c9435523572dc97839ce18b615..dd6cd81650f93c22ce7b0284644bf917ecb56cf3 100644 --- a/software/kvm/buildout.hash.cfg +++ b/software/kvm/buildout.hash.cfg @@ -19,7 +19,7 @@ md5sum = 7e90da1f6dac4233e1aa3248f48e357c [template-kvm] filename = instance-kvm.cfg.jinja2 -md5sum = 42fa6306968516fc9ea9b690ad3b645e +md5sum = 4a3f999a8d1705c0cabf58d563953d4d [template-kvm-cluster] filename = instance-kvm-cluster.cfg.jinja2.in diff --git a/software/kvm/instance-kvm.cfg.jinja2 b/software/kvm/instance-kvm.cfg.jinja2 index 687f1783ca79990a4d89b18f1aeef38eee569d3f..5572a43fd778721a7344a9c8fd9553a3eba4181d 100644 --- a/software/kvm/instance-kvm.cfg.jinja2 +++ b/software/kvm/instance-kvm.cfg.jinja2 @@ -6,19 +6,19 @@ {% 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' -%} -{% set use_nat = str(slapparameter_dict.get('use-nat', True)).lower() == 'true' -%} -{% set wipe_disk = str(slapparameter_dict.get('wipe-disk-ondestroy', False)).lower() == 'true' -%} -{% set nat_restrict = str(slapparameter_dict.get('nat-restrict-mode', False)).lower() == 'true' -%} +{% set enable_http = slapparameter_dict.get('enable-http-server', False) -%} +{% set use_tap = slapparameter_dict.get('use-tap', True) -%} +{% set use_nat = slapparameter_dict.get('use-nat', True) -%} +{% set wipe_disk = slapparameter_dict.get('wipe-disk-ondestroy', False) -%} +{% set nat_restrict = slapparameter_dict.get('nat-restrict-mode', False) -%} {% set name = slapparameter_dict.get('name', 'localhost') -%} -{% set disable_ansible_promise = str(slapparameter_dict.get('disable-ansible-promise', True)).lower() == 'true' -%} +{% set disable_ansible_promise = slapparameter_dict.get('disable-ansible-promise', True) -%} {% set instance_type = slapparameter_dict.get('type', 'standalone') -%} {% set nat_rule_list = slapparameter_dict.get('nat-rules', '22 80 443') -%} {% set disk_device_path = slapparameter_dict.get('disk-device-path', None) -%} {% set whitelist_domains = slapparameter_dict.get('whitelist-domains', '') -%} {% set virtual_hard_drive_url_enabled = 'virtual-hard-drive-url' in slapparameter_dict %} -{% set virtual_hard_drive_url_gzipped = str(slapparameter_dict.get('virtual-hard-drive-gzipped', False)).lower() == 'true' %} +{% set virtual_hard_drive_url_gzipped = slapparameter_dict.get('virtual-hard-drive-gzipped', False) %} {% set boot_image_url_list_enabled = 'boot-image-url-list' in slapparameter_dict %} {% set boot_image_url_select_enabled = 'boot-image-url-select' in slapparameter_dict %} {% set bootstrap_script_url = slapparameter_dict.get('bootstrap-script-url') -%} @@ -434,7 +434,7 @@ network-adapter = ${slap-parameter:network-adapter} pid-file-path = ${kvm-controller-parameter-dict:pid-file} socket-path = ${kvm-controller-parameter-dict:socket-path} -{%- set enable_device_hotplug = slapparameter_dict.get('enable-device-hotplug', 'false').lower() == 'true' %} +{%- set enable_device_hotplug = slapparameter_dict.get('enable-device-hotplug', False) %} smp-max-count = {{ cpu_max_count }} ram-max-size = {{ ram_max_size }} {%- if enable_device_hotplug %}