software/kvm: remove keyboard option

The keyboard option is actually not recommended in the QEMU
documentation
(https://manpages.debian.org/buster/qemu-system-x86/qemu-system-x86_64.1.en.html).
After some tests, it appears that noVNC is already sending raw keyCode
to QEMU since 2016 (see
https://github.com/novnc/noVNC/commit/f4f4e8993d6daeb43b957766cd6973993232ba13).

More information can be found in
https://github.com/novnc/noVNC/issues/21 and
https://www.berrange.com/posts/2010/07/04/more-than-you-or-i-ever-wanted-to-know-about-virtual-keyboard-handling/

software/kvm/README.rst

@@ -88,12 +88,6 @@ KVM instance parameters:
 - data-to-vm
     send some text content which will be accessible to the vm through the file: http://10.0.2.100/data
 
-- keyboard-layout-language (default: fr)
-    Change keyboard layout language (Change to en-us if you face some bad bihaviors)
-    Language list: ['ar', 'da', 'de', 'de-ch', 'en-gb', 'en-us', 'es', 'et', 'fi',
-    'fo', 'fr', 'fr-be', 'fr-ca', 'fr-ch', 'hr', 'hu', 'is', 'it', 'ja', 'lt',
-    'lv', 'mk', 'nl', 'nl-be', 'no', 'pl', 'pt', 'pt-br', 'ru', 'sl', 'sv',
-    'th', 'tr']
 
 Resilient KVM instance
 ~~~~~~~~~~~~~~~~~~~~~~

software/kvm/buildout.hash.cfg

@@ -19,11 +19,11 @@ md5sum = 0d34ff81779115bf899f7bc752877b70
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
-md5sum = 9d0980144f91d10d8a5cee041f385d34
+md5sum = 854ec0f379a05246f5f3761fdb634c36
 
 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in
-md5sum = 80b9b70ba1ccbc09deb8f9cad60f352c
+md5sum = 5f092853a949e129ed3f6938bb439b6b
 
 [template-kvm-resilient]
 filename = instance-kvm-resilient.cfg.jinja2
@@ -55,7 +55,7 @@ md5sum = b7e87479a289f472b634a046b44b5257
 
 [template-kvm-run]
 filename = template/template-kvm-run.in
-md5sum = d1748b18fc76544cc71be5c40ed9cbb9
+md5sum = a8afeb2f80199368e291621576a80ca1
 
 [template-kvm-controller]
 filename = template/kvm-controller-run.in

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

@@ -337,47 +337,6 @@
               "type": "string",
               "default": "host"
             },
-            "keyboard-layout-language": {
-              "title": "Use keyboard layout language",
-              "description": "Use keyboard layout language (for example fr for French). Can be usefull with VNC display",
-              "type": "string",
-              "enum": [
-                "ar",
-                "da",
-                "de",
-                "de-ch",
-                "en-gb",
-                "en-us",
-                "es",
-                "et",
-                "fi",
-                "fo",
-                "fr",
-                "fr-be",
-                "fr-ca",
-                "fr-ch",
-                "hr",
-                "hu",
-                "is",
-                "it",
-                "ja",
-                "lt",
-                "lv",
-                "mk",
-                "nl",
-                "nl-be",
-                "no",
-                "pl",
-                "pt",
-                "pt-br",
-                "ru",
-                "sl",
-                "sv",
-                "th",
-                "tr"
-              ],
-              "default": "fr"
-            },
             "nbd-host": {
               "title": "NBD hostname or IP",
               "description": "hostname (or IP) of the NBD server containing the boot image.",

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

@@ -19,47 +19,6 @@
                 "stopped"
               ]
             },
-            "keyboard-layout-language": {
-              "title": "Use keyboard layout language",
-              "description": "Use keyboard layout language (for example fr for French). Can be usefull with VNC display",
-              "type": "string",
-              "enum": [
-                "ar",
-                "da",
-                "de",
-                "de-ch",
-                "en-gb",
-                "en-us",
-                "es",
-                "et",
-                "fi",
-                "fo",
-                "fr",
-                "fr-be",
-                "fr-ca",
-                "fr-ch",
-                "hr",
-                "hu",
-                "is",
-                "it",
-                "ja",
-                "lt",
-                "lv",
-                "mk",
-                "nl",
-                "nl-be",
-                "no",
-                "pl",
-                "pt",
-                "pt-br",
-                "ru",
-                "sl",
-                "sv",
-                "th",
-                "tr"
-              ],
-              "default": "fr"
-            },
             "boot-image-url-select": {
               "title": "Boot image",
               "type": "array",

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

@@ -134,7 +134,6 @@ config-wipe-disk-iterations = {{ dumps(kvm_parameter_dict.get('wipe-disk-iterati
 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')) }}
 {%- for k in ['boot-image-url-list', 'boot-image-url-select', 'whitelist-domains'] %}
 {#-   play nice - use parameter only if present #}
 {%-   if k in kvm_parameter_dict %}

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

@@ -125,47 +125,6 @@
       "type": "string",
       "default": "host"
     },
-    "keyboard-layout-language": {
-      "title": "Use keyboard layout language",
-      "description": "Use keyboard layout language (for example fr for French). Can be usefull with VNC display",
-      "type": "string",
-      "enum": [
-        "ar",
-        "da",
-        "de",
-        "de-ch",
-        "en-gb",
-        "en-us",
-        "es",
-        "et",
-        "fi",
-        "fo",
-        "fr",
-        "fr-be",
-        "fr-ca",
-        "fr-ch",
-        "hr",
-        "hu",
-        "is",
-        "it",
-        "ja",
-        "lt",
-        "lv",
-        "mk",
-        "nl",
-        "nl-be",
-        "no",
-        "pl",
-        "pt",
-        "pt-br",
-        "ru",
-        "sl",
-        "sv",
-        "th",
-        "tr"
-      ],
-      "default": "fr"
-    },
     "nbd-host": {
       "title": "NBD hostname",
       "description": "hostname (or IP) of the NBD server containing the boot image.",

software/kvm/instance-kvm.cfg.jinja2

@@ -374,7 +374,6 @@ cluster-doc-host =
 cluster-doc-port = 0
 {% endif -%}
 netcat-binary = {{ netcat_bin }}
-language = ${slap-parameter:keyboard-layout-language}
 
 name = {{ slapparameter_dict.get('name', 'Single KVM') }}
 disk-cache = ${slap-parameter:disk-cache}
@@ -964,9 +963,6 @@ authorized-key =
 # send some content which will be accessible to the vm through static url: http://10.0.2.100/data
 data-to-vm =
 
-# Change keyboard layout language (Change to en-us if you face some bad bihaviors)
-keyboard-layout-language = fr
-
 {% for k, v in slapparameter_dict.items() -%}
 {% if k == 'authorized-key' and v -%}
 {% set key_list =  v.split('\n') -%}

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

@@ -67,11 +67,6 @@ httpd_port = {{ parameter_dict.get("httpd-port") }}
 netcat_bin = '{{ parameter_dict.get("netcat-binary") }}'.strip()
 cluster_doc_host = '{{ parameter_dict.get("cluster-doc-host") }}'
 cluster_doc_port = {{ parameter_dict.get("cluster-doc-port") }}
-language = '{{ parameter_dict.get("language") }}'
-language_list = ['ar', 'da', 'de', 'de-ch', 'en-gb', 'en-us', 'es', 'et', 'fi',
-    'fo', 'fr', 'fr-be', 'fr-ca', 'fr-ch', 'hr', 'hu', 'is', 'it', 'ja', 'lt',
-    'lv', 'mk', 'nl', 'nl-be', 'no', 'pl', 'pt', 'pt-br', 'ru', 'sl', 'sv',
-    'th', 'tr']
 url_check_certificate = '{{ parameter_dict.get("hard-drive-url-check-certificate", "true") }}'.lower()
 auto_ballooning = '{{ parameter_dict.get("auto-ballooning") }}' in ('true', 'True', '1')
 vm_name = '{{ parameter_dict.get("name") }}'
@@ -337,8 +332,6 @@ if tap_network_parameter == [] and nat_network_parameter == []:
   print('Warning : No network interface defined.')
 else:
   kvm_argument_list += nat_network_parameter + tap_network_parameter
-if language in language_list:
-  kvm_argument_list.extend(['-k', language])
 
 for disk in additional_disk_list:
   kvm_argument_list.extend([

[Łukasz Nowak]

💌