Skip to content

slapos
slapos
Commit 7298bf24 authored by Łukasz Nowak's avatar Łukasz Nowak
Browse files
Options

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

boot-image-url-select is used instead of default image being downloaded by the
software release.

If nothing is selected, the default boot-image-url-select is used, but not if
other way to obatin boot image is enabled.

XXX:
  * update tests for boot-image-url-select
  * cover non-default cases (boot-image-url-list, nbd-host, nbd2-host and virtual-hardrive...)
parent f4e8811b
Pipeline #22988 running with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 57 additions and 111 deletions
    software/kvm/buildout.hash.cfg
    View file @ 7298bf24
    ......@@ -15,11 +15,11 @@
    [template]
    filename = instance.cfg.in
    md5sum = 7e90da1f6dac4233e1aa3248f48e357c
    md5sum = 8aeb4aca72c236ebc2e3699c7106f74c
    [template-kvm]
    filename = instance-kvm.cfg.jinja2
    md5sum = ff9fb2378a48d1ca8c72f6a87d3a0221
    md5sum = cf7d37c440f05c2c0f195de0863f8d6b
    [template-kvm-cluster]
    filename = instance-kvm-cluster.cfg.jinja2.in
    ......@@ -55,7 +55,7 @@ md5sum = a8cf453d20f01c707f02c4b4014580d8
    [template-kvm-run]
    filename = template/template-kvm-run.in
    md5sum = 7da4fcd815cb7abe318d8ac4b98c8cf3
    md5sum = 5e89d610b2abfcbd8d2fbf8077852341
    [template-kvm-controller]
    filename = template/kvm-controller-run.in
    ......@@ -92,3 +92,7 @@ md5sum = bc64e29546833817636261d1b28aa6dc
    [whitelist-domains-default]
    filename = template/whitelist-domains-default
    md5sum = e9d40162ba77472775256637a2617d14
    [boot-image-select-source-config]
    filename = template/boot-image-select-source-config.json.in
    md5sum = b98b41173d116c7d61a3e466f182b2f8
    software/kvm/instance-kvm-cluster-input-schema.json
    View file @ 7298bf24
    ......@@ -461,57 +461,18 @@
    },
    "boot-image-url-select": {
    "title": "Boot image",
    "type": "string",
    "description": "Selectable list of provided ISO images.",
    "type": "array",
    "oneOf": [
    {
    "const": [
    "https://shacache.nxdcdn.com/02257c3ec27e45d9f022c181a69b59da67e5c72871cdb4f9a69db323a1fad58093f2e69702d29aa98f5f65e920e0b970d816475a5a936e1f3bf33832257b7e92#b710c178eb434d79ce40ce703d30a5f0"
    ],
    "title": "Debian Bullseye 11.1 netinst x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/bc469019b9057073d36ff8f5402c95ff0a0363657358336dc9a05fc6af66276229aa727ec46cf17b84d308f44b825de7f24ea1a256062a14e0f605cd70bae02f#2dcf188877075d7b58ca46e27ca31bb9"
    ],
    "title": "Debian Buster 10.12 netinst x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/ce5ddfdbdaccdf929b7fe321212356347d82a02f6b7733427282b416f113d91e587682b003e9d376ac189c3b731595c50c236962aadf2720c16d9f36913577c0#23bf2a2d60271e553e63525e794415f1"
    ],
    "title": "Centos 8.2004 Minimal x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/302c990c6d69575ff24c96566e5c7e26bf36908abb0cd546e22687c46fb07bf8dba595bf77a9d4fd9ab63e75c0437c133f35462fd41ea77f6f616140cd0e5e6a#f3a306f40e4a313fb5a584d73b3dee8f"
    ],
    "title": "Ubuntu Focal 20.04.1 Live Server x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/6635269a7eb6fbd6b85fda40cd94f14a27bf53cb1fc82ffcce9fe386a025a43e1ab681db7e8cec50416bfbfc90262f0d95273686a101c74b3f17646f0a34c85b#3708a59af6cf820a95cafe0ae73ac399"
    ],
    "title": "openSUSE Leap 15.2 NET x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/fc17e8c6ae0790162f4beb8fa6226d945cff638429588999b3a08493ff27b280dc2939fba825ae04be1d9082ea8d7c3c002c5e4c39fbbcf88b8ab5104619e28a#ebcdb2223a77f098af3923fe1fa180aa"
    ],
    "title": "Arch Linux 2020.09.01 x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/c5a511f349a1146b615e6fab9c24f9be4362046adcf24f0ff82c470d361fac5f6628895e2110ebf8ff87db49d4c413a0a332699da6b1bec64275e0c17a15b999#ca7a1e555c04b4d9a549065fa2ddf713"
    ],
    "title": "Fedora Server 32-1.6 netinst x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/6c355def68b3c0427f21598cb054ffc893568902f205601ac60f192854769b31bc9cff8eeb6ce99ef975a8fb887d8d3e56fc6cd5ea5cb4b3bba1175c520047cb#57088b77f795ca44b00971e44782ee23"
    ],
    "title": "FreeBSD 12.1 RELEASE bootonly x86_64"
    }
    "default": "Debian Bullseye 11 netinst x86_64",
    "enum": [
    "Debian Bullseye 11 netinst x86_64",
    "Debian Buster 10 netinst x86_64",
    "Centos 8.2004 Minimal x86_64",
    "Ubuntu Focal 20.04 Live Server x86_64",
    "openSUSE Leap 15 NET x86_64",
    "Arch Linux 2020.09.01 x86_64",
    "Fedora Server 32 netinst x86_64",
    "FreeBSD 12.1 RELEASE bootonly x86_64"
    ]
    },
    "whitelist-domains": {
    ......
    software/kvm/instance-kvm-input-schema.json
    View file @ 7298bf24
    ......@@ -325,50 +325,17 @@
    "boot-image-url-select": {
    "title": "Boot image",
    "description": "Selectable list of provided ISO images.",
    "type": "array",
    "oneOf": [
    {
    "const": [
    "https://shacache.nxdcdn.com/bc469019b9057073d36ff8f5402c95ff0a0363657358336dc9a05fc6af66276229aa727ec46cf17b84d308f44b825de7f24ea1a256062a14e0f605cd70bae02f#2dcf188877075d7b58ca46e27ca31bb9"
    ],
    "title": "Debian Buster 10.12 netinst x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/ce5ddfdbdaccdf929b7fe321212356347d82a02f6b7733427282b416f113d91e587682b003e9d376ac189c3b731595c50c236962aadf2720c16d9f36913577c0#23bf2a2d60271e553e63525e794415f1"
    ],
    "title": "Centos 8.2004 Minimal x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/302c990c6d69575ff24c96566e5c7e26bf36908abb0cd546e22687c46fb07bf8dba595bf77a9d4fd9ab63e75c0437c133f35462fd41ea77f6f616140cd0e5e6a#f3a306f40e4a313fb5a584d73b3dee8f"
    ],
    "title": "Ubuntu Focal 20.04.1 Live Server x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/6635269a7eb6fbd6b85fda40cd94f14a27bf53cb1fc82ffcce9fe386a025a43e1ab681db7e8cec50416bfbfc90262f0d95273686a101c74b3f17646f0a34c85b#3708a59af6cf820a95cafe0ae73ac399"
    ],
    "title": "openSUSE Leap 15.2 NET x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/fc17e8c6ae0790162f4beb8fa6226d945cff638429588999b3a08493ff27b280dc2939fba825ae04be1d9082ea8d7c3c002c5e4c39fbbcf88b8ab5104619e28a#ebcdb2223a77f098af3923fe1fa180aa"
    ],
    "title": "Arch Linux 2020.09.01 x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/c5a511f349a1146b615e6fab9c24f9be4362046adcf24f0ff82c470d361fac5f6628895e2110ebf8ff87db49d4c413a0a332699da6b1bec64275e0c17a15b999#ca7a1e555c04b4d9a549065fa2ddf713"
    ],
    "title": "Fedora Server 32-1.6 netinst x86_64"
    },
    {
    "const": [
    "https://shacache.nxdcdn.com/6c355def68b3c0427f21598cb054ffc893568902f205601ac60f192854769b31bc9cff8eeb6ce99ef975a8fb887d8d3e56fc6cd5ea5cb4b3bba1175c520047cb#57088b77f795ca44b00971e44782ee23"
    ],
    "title": "FreeBSD 12.1 RELEASE bootonly x86_64"
    }
    "type": "string",
    "default": "Debian Bullseye 11 netinst x86_64",
    "enum": [
    "Debian Bullseye 11 netinst x86_64",
    "Debian Buster 10 netinst x86_64",
    "Centos 8.2004 Minimal x86_64",
    "Ubuntu Focal 20.04 Live Server x86_64",
    "openSUSE Leap 15 NET x86_64",
    "Arch Linux 2020.09.01 x86_64",
    "Fedora Server 32 netinst x86_64",
    "FreeBSD 12.1 RELEASE bootonly x86_64"
    ]
    },
    "whitelist-domains": {
    ......
    software/kvm/instance-kvm.cfg.jinja2
    View file @ 7298bf24
    ......@@ -20,7 +20,16 @@
    {% set virtual_hard_drive_url_enabled = 'virtual-hard-drive-url' in slapparameter_dict %}
    {% 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 %}
    {% 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 %}
    {% 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 %}
    {% 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)) %}
    ......@@ -99,11 +108,8 @@ config-url = ${monitor-base:base-url}/private/boot-image-url-select/${:filename}
    [boot-image-url-select-source-config]
    recipe = slapos.recipe.template:jinja2
    inline =
    {%- raw %}
    {{ boot_image_url_select }}
    {% endraw -%}
    boot-image-url-select = {{ dumps(slapparameter_dict['boot-image-url-select']) }}
    url = {{ boot_image_select_source_config }}
    boot-image-url-select = {{ dumps(slapparameter_dict.get('boot-image-url-select', 'Debian Bullseye 11 netinst x86_64')) }}
    context =
    key boot_image_url_select :boot-image-url-select
    output = ${directory:etc}/boot-image-url-select.json
    ......@@ -399,7 +405,6 @@ ipv6 = ${slap-network-information:global-ipv6}
    vnc-ip = ${:ipv4}
    vnc-port = 5901
    default-cdrom-iso = {{ debian_amd64_netinst_location }}
    {% if virtual_hard_drive_url_enabled %}
    virtual-hard-drive-url-json-config = ${virtual-hard-drive-url-json-config:output}
    {% else %}
    ......
    software/kvm/instance.cfg.in
    View file @ 7298bf24
    ......@@ -81,9 +81,9 @@ extra-context =
    raw dash_executable_location ${dash:location}/bin/dash
    raw dnsresolver_executable ${buildout:bin-directory}/dnsresolver
    raw dcron_executable_location ${dcron:location}/sbin/crond
    raw debian_amd64_netinst_location ${debian-amd64-bullseye-netinst.iso:target}
    raw whitelist_domains_default ${whitelist-domains-default:target}
    raw whitelist_firewall_download_controller ${whitelist-firewall-download-controller:target}
    raw boot_image_select_source_config ${boot-image-select-source-config:target}
    raw image_download_controller ${image-download-controller:target}
    raw image_download_config_creator ${image-download-config-creator:target}
    raw logrotate_cfg ${template-logrotate-base:output}
    ......
    software/kvm/software.cfg
    View file @ 7298bf24
    ......@@ -132,6 +132,9 @@ context =
    [whitelist-domains-default]
    <= download-base
    [boot-image-select-source-config]
    <= download-base
    [versions]
    websockify = 0.9.0
    gitdb = 0.6.4
    ......
    software/kvm/template/boot-image-select-source-config.json.in 0 → 100644
    View file @ 7298bf24
    {%- set IMAGE_URL_MAPPING = {
    "Debian Bullseye 11 netinst x86_64" : "https://shacache.nxdcdn.com/02257c3ec27e45d9f022c181a69b59da67e5c72871cdb4f9a69db323a1fad58093f2e69702d29aa98f5f65e920e0b970d816475a5a936e1f3bf33832257b7e92#b710c178eb434d79ce40ce703d30a5f0",
    "Debian Buster 10 netinst x86_64" : "https://shacache.nxdcdn.com/bc469019b9057073d36ff8f5402c95ff0a0363657358336dc9a05fc6af66276229aa727ec46cf17b84d308f44b825de7f24ea1a256062a14e0f605cd70bae02f#2dcf188877075d7b58ca46e27ca31bb9",
    "Centos 8.2004 Minimal x86_64" : "https://shacache.nxdcdn.com/ce5ddfdbdaccdf929b7fe321212356347d82a02f6b7733427282b416f113d91e587682b003e9d376ac189c3b731595c50c236962aadf2720c16d9f36913577c0#23bf2a2d60271e553e63525e794415f1",
    "Ubuntu Focal 20.04 Live Server x86_64" : "https://shacache.nxdcdn.com/302c990c6d69575ff24c96566e5c7e26bf36908abb0cd546e22687c46fb07bf8dba595bf77a9d4fd9ab63e75c0437c133f35462fd41ea77f6f616140cd0e5e6a#f3a306f40e4a313fb5a584d73b3dee8f",
    "openSUSE Leap 15 NET x86_64" : "https://shacache.nxdcdn.com/6635269a7eb6fbd6b85fda40cd94f14a27bf53cb1fc82ffcce9fe386a025a43e1ab681db7e8cec50416bfbfc90262f0d95273686a101c74b3f17646f0a34c85b#3708a59af6cf820a95cafe0ae73ac399",
    "Arch Linux 2020.09.01 x86_64" : "https://shacache.nxdcdn.com/fc17e8c6ae0790162f4beb8fa6226d945cff638429588999b3a08493ff27b280dc2939fba825ae04be1d9082ea8d7c3c002c5e4c39fbbcf88b8ab5104619e28a#ebcdb2223a77f098af3923fe1fa180aa",
    "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 -#}
    software/kvm/template/template-kvm-run.in
    View file @ 7298bf24
    ......@@ -27,7 +27,6 @@ nbd_list = (('{{ parameter_dict.get("nbd-host") }}',
    {{ parameter_dict.get("nbd-port") }}),
    ('{{ parameter_dict.get("nbd2-host") }}',
    {{ parameter_dict.get("nbd2-port") }}))
    default_cdrom_iso = '{{ parameter_dict.get("default-cdrom-iso") }}'
    nat_rules = '{{ parameter_dict.get("nat-rules") }}'.strip()
    use_tap = '{{ parameter_dict.get("use-tap") }}'.lower()
    ......@@ -401,11 +400,6 @@ else:
    if boot_image_url_list_json_config:
    # Support boot-image-url-list
    handle_image(boot_image_url_list_json_config, 'boot-image-url-list')
    # Always add by default the default image
    kvm_argument_list.extend([
    '-drive', 'file=%s,media=cdrom' % default_cdrom_iso
    ])
    print('Starting KVM: \n %s' % ' '.join(kvm_argument_list))
    os.execv(qemu_path, kvm_argument_list)
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7