Merge branch 'kvm-cluster'

software/kvm/common.cfg

@@ -90,7 +90,7 @@ command =
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 41eb12b66bd1af86b1b98b2166e86417
+md5sum = ac94fdcf8e3db4bdb2dff4478426595d
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
@@ -98,7 +98,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
 mode = 644
-md5sum = 90309e9a1efe6d6b981a27f503c86277
+md5sum = 4056df213786fd87b60efd3d6f1f2bec
 download-only = true
 on-update = true
 
@@ -106,7 +106,7 @@ on-update = true
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
 mode = 644
-md5sum = 0e06ef2879454eee140fe00e167a01d5
+md5sum = 8e84c7a4e7be009021243c14707e0a1e
 download-only = true
 on-update = true
 
@@ -114,7 +114,7 @@ on-update = true
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm-resilient.cfg.jinja2
 mode = 644
-md5sum = 450a50069f5617993ac8de47d533d653
+md5sum = 7564bfbb74e6557e1041e9d6d1bc5d14
 download-only = true
 on-update = true
 
@@ -179,6 +179,24 @@ mode = 0644
 download-only = true
 filename = ansible-promise.in
 
+[template-kvm-run]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/template/template-kvm-run.in
+mode = 644
+filename = template-kvm-run.in
+md5sum = 38265d52fdc03589081cc7dd13999020
+download-only = true
+on-update = true
+
+[template-kvm-controller]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/template/kvm-controller-run.in
+mode = 644
+filename = kvm-controller-run.in
+md5sum = b61ef9c54d912fdbfed3899fa985f79c
+download-only = true
+on-update = true
+
 [template-apache-conf]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/template/apache.conf.in

software/kvm/instance-kvm-cluster-input-schema.json

@@ -242,23 +242,6 @@
               "minimum": 1,
               "maximum": 65535
             },
-            "nbd2-host": {
-              "title": "Second NBD hostname or IP",
-              "description": "hostname (or IP) of the second NBD server (containing drivers for example).",
-              "type": "string",
-              "format": [
-                "host-name",
-                "ip-address",
-                "ipv6"
-              ]
-            },
-            "nbd2-port": {
-              "title": "Second NBD port",
-              "description": "Port of the second NBD server containing the boot image.",
-              "type": "integer",
-              "minimum": 1,
-              "maximum": 65535
-            },
             "virtual-hard-drive-url": {
               "title": "Existing disk image URL",
               "description": "If specified, will download an existing disk image (qcow2, raw, ...), and will use it as main virtual hard drive. Can be used to download and use an already installed and customized virtual hard drive.",
@@ -276,6 +259,12 @@
               "type": "boolean",
               "default": false
             },
+            "hard-drive-url-check-certificate": {
+              "title": "Check certificate when downloading virtual hard drive from https.",
+              "description": "Define if certificate should be checked when downloading virtual hard drive from https url.",
+              "type": "boolean",
+              "default": true
+            },
             "external-disk-number": {
               "title": "Number of additional disk to create for virtual machine",
               "description": "Specify the number of additional disk to create for virtual machine in data folder of SlapOS Node. Requires instance_storage_home to be configured on SlapOS Node.",

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

@@ -60,6 +60,7 @@ 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', '')) }}
 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)) }}
 config-external-disk-size = {{ dumps(kvm_parameter_dict.get('external-disk-size', 20)) }}
 config-external-disk-format = {{ dumps(kvm_parameter_dict.get('external-disk-format', 'qcow2')) }}

software/kvm/instance-kvm-input-schema.json

@@ -98,6 +98,12 @@
       "type": "boolean",
       "default": false
     },
+    "hard-drive-url-check-certificate": {
+      "title": "Check certificate when downloading virtual hard drive from https.",
+      "description": "Define if certificate should be checked when downloading virtual hard drive from https url.",
+      "type": "boolean",
+      "default": true
+    },
 
     "external-disk-number": {
       "title": "Number of additional disk to create for virtual machine",

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

@@ -13,7 +13,7 @@ offline = true
 # += because we need to take up parts (like instance-custom, slapmonitor etc) from the profile we extended
 parts +=
   {{ parts.replicate("kvm", backup_amount) }}
-  publish-connection-informations
+  publish-connection-information
   kvm-frontend-url-promise
   kvm-backend-url-promise
 
@@ -55,6 +55,6 @@ mode = 700
 # Check that backend url is reachable
 recipe = slapos.cookbook:check_url_available
 path = ${directory:promises}/frontend_promise
-url = ${publish-connection-informations:url}
+url = ${publish-connection-information:url}
 dash_path = /bin/sh
 curl_path = {{ curl_executable_location }}

software/kvm/instance.cfg.in

@@ -92,11 +92,14 @@ context =
     raw novnc_location ${noVNC:location}
     raw netcat_bin ${netcat:location}/bin/netcat
     raw openssl_executable_location ${openssl:location}/bin/openssl
+    raw python_executable ${buildout:executable}
     raw qemu_executable_location ${kvm:location}/bin/qemu-system-x86_64
     raw qemu_img_executable_location ${kvm:location}/bin/qemu-img
     raw sixtunnel_executable_location ${6tunnel:location}/bin/6tunnel
     raw template_httpd_cfg ${template-httpd:rendered}
     raw template_content ${template-content:location}/${template-content:filename}
+    raw template_kvm_controller_run ${template-kvm-controller:location}/${template-kvm-controller:filename}
+    raw template_kvm_run ${template-kvm-run:location}/${template-kvm-run:filename}
     raw template_monitor ${monitor-template:output}
     raw websockify_executable_location ${buildout:directory}/bin/websockify
 template-parts-destination = ${template-parts:destination}

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

+#!{{ parameter_dict.get('python-path') }}
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+
+# Echo client program
+import socket
+import time
+
+# XXX: to be factored with slapos.toolbox qemu qmp wrapper.
+
+socket_path = '{{ parameter_dict.get("socket-path") }}'
+vnc_password = '{{ parameter_dict.get("vnc-passwd") }}'
+
+# Connect to KVM qmp socket
+so = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+connected = False
+while not connected:
+  try:
+    so.connect(socket_path)
+  except socket.error:
+    time.sleep(1)
+  else:
+    connected = True
+data = so.recv(1024)
+
+# Enable qmp
+so.send('{ "execute": "qmp_capabilities" }')
+data = so.recv(1024)
+
+# Set VNC password
+so.send('{ "execute": "change", ' \
+        '"arguments": { "device": "vnc", "target": "password", ' \
+        '               "arg": "' + vnc_password + '" } }')
+data = so.recv(1024)
+
+# Finish
+so.close()