fixup! XXX software/kvm: Drop default image and replace it with boot-image-url-select

software/kvm/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = cca7eb0f975da97491aa7803d5bd753b
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
-md5sum = 1e51153b0498b6b0d44140f3bab8f4b0
+md5sum = 34b32389f9a1d5e1a93e5d57d2ae674e
 
 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in
@@ -59,7 +59,7 @@ md5sum = 6328f99728284847b8dd1146aadeae1b
 
 [template-kvm-run]
 filename = template/template-kvm-run.in
-md5sum = 75696496b7d7efbd54dce7d2aa73c6dc
+md5sum = c7bba51a59eef9dd1d6d7068ade4e92d
 
 [template-kvm-controller]
 filename = template/kvm-controller-run.in
@@ -99,4 +99,4 @@ md5sum = e9d40162ba77472775256637a2617d14
 
 [boot-image-select-source-config]
 filename = template/boot-image-select-source-config.json.in
-md5sum = a80df3f3b445f8b1a575bc5e5bd0f541
+md5sum = 201c9ed07d7464e9f426a3ea7309a77d

software/kvm/instance-kvm.cfg.jinja2

@@ -23,13 +23,15 @@
 {% if 'boot-image-url-select' in slapparameter_dict %}
 {%   set boot_image_url_select_enabled = True %}
 {% else %}
-{%   if boot_image_url_list_enabled or 'nbd-host' in slapparameter_dict or 'nbd2-host' in slapparameter_dict or virtual_hard_drive_url_enabled %}
+{%   if boot_image_url_list_enabled or 'nbd-host' in slapparameter_dict or 'nbd2-host' in slapparameter_dict or boot_image_url_list_enabled or virtual_hard_drive_url_enabled %}
 {%     set boot_image_url_select_enabled = False %}
 {%   else %}
 {#     Become default if no other way is used to provide the boot image #}
 {%     set boot_image_url_select_enabled = True %}
 {%   endif %}
 {% endif %}
+# boot_image_url_list_enabled = {{ boot_image_url_list_enabled }}
+# boot_image_url_select_enabled = {{ boot_image_url_select_enabled }}
 {% set bootstrap_script_url = slapparameter_dict.get('bootstrap-script-url') -%}
 {% set cpu_max_count = dumps(slapparameter_dict.get('cpu-max-count', int(slapparameter_dict.get('cpu-count', 2)) + 1)) %}
 {% set ram_max_size = dumps(slapparameter_dict.get('ram-max-size', int(slapparameter_dict.get('ram-size', 4096)) + 512)) %}

software/kvm/template/boot-image-select-source-config.json.in

@@ -8,5 +8,6 @@
  "Fedora Server 32 netinst x86_64" : "https://shacache.nxdcdn.com/c5a511f349a1146b615e6fab9c24f9be4362046adcf24f0ff82c470d361fac5f6628895e2110ebf8ff87db49d4c413a0a332699da6b1bec64275e0c17a15b999#ca7a1e555c04b4d9a549065fa2ddf713",
  "FreeBSD 12.1 RELEASE bootonly x86_64" : "https://shacache.nxdcdn.com/6c355def68b3c0427f21598cb054ffc893568902f205601ac60f192854769b31bc9cff8eeb6ce99ef975a8fb887d8d3e56fc6cd5ea5cb4b3bba1175c520047cb#57088b77f795ca44b00971e44782ee23",
 } -%}
-["{{ IMAGE_URL_MAPPING[boot_image_url_select] }}"]
-{#- Note: Above is explicitely set to fail in case if wrong key is present, as this will force users to select correct image name, especially after upgrade -#}
+["{{ IMAGE_URL_MAPPING.get(boot_image_url_select, '') }}"]
+{#- Note-XXX: Above is explicitely set to fail in case if wrong key is present, as this will force users to select correct image name, especially after upgrade -#}
+{#-           Idea dropped, as promise shall be used, and when buildout fails, no promise runs -#}

software/kvm/template/template-kvm-run.in

@@ -405,12 +405,13 @@ for nbd_ip, nbd_port in nbd_list:
 else:
   # Note: Do not get tempted to use virtio-scsi-pci, as it does not work with
   #       Debian installation CDs, rendering it uninstallable
-  if boot_image_url_select_json_config:
-    # Support boot-image-url-select
-    handle_image(boot_image_url_select_json_config, 'boot-image-url-select')
+  # Note: boot-image-url-list has precedence over boot-image-url-select
   if boot_image_url_list_json_config:
     # Support boot-image-url-list
     handle_image(boot_image_url_list_json_config, 'boot-image-url-list')
+  if boot_image_url_select_json_config:
+    # Support boot-image-url-select
+    handle_image(boot_image_url_select_json_config, 'boot-image-url-select')
 
 print('Starting KVM: \n %s' % ' '.join(kvm_argument_list))
 os.execv(qemu_path, kvm_argument_list)