diff options
author | Christian Pointner <equinox@spreadspace.org> | 2022-09-05 18:42:45 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2022-09-05 18:42:45 +0200 |
commit | d8cad6edea49880eb93f8376c2425dfce4ed6716 (patch) | |
tree | c91f0bc785ed015b9d8f6d9d7cfc768be762f9a6 | |
parent | raspios/image/firstrun: trigger restart of dhcpd after network config (diff) |
ubuntu/installer: fix early command and focal support
-rw-r--r-- | chaos-at-home/ch-thetys.yml | 4 | ||||
-rw-r--r-- | inventory/host_vars/ch-thetys.yml | 9 | ||||
-rw-r--r-- | roles/installer/ubuntu/autoinstall/files/early-command.py | 8 | ||||
-rw-r--r-- | roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 | 5 |
4 files changed, 16 insertions, 10 deletions
diff --git a/chaos-at-home/ch-thetys.yml b/chaos-at-home/ch-thetys.yml index 7c5a32b7..27b85f71 100644 --- a/chaos-at-home/ch-thetys.yml +++ b/chaos-at-home/ch-thetys.yml @@ -8,6 +8,10 @@ - role: core/zsh - role: core/ntp - role: core/cpu-microcode + +- name: Payload Setup + hosts: ch-thetys + roles: - role: streaming/blackmagic/desktopvideo - role: apt-repo/spreadspace - role: kubernetes/base diff --git a/inventory/host_vars/ch-thetys.yml b/inventory/host_vars/ch-thetys.yml index 25e56ed5..5fda8f08 100644 --- a/inventory/host_vars/ch-thetys.yml +++ b/inventory/host_vars/ch-thetys.yml @@ -1,6 +1,5 @@ --- -system_lvm_volume_size_root: 3G - +system_lvm_volume_size_root: 4G install: efi: true disks: @@ -33,6 +32,7 @@ blackmagic_desktopvideo_include_gui: yes docker_pkg_provider: docker-com + docker_storage: type: lvm vg: "{{ host_name }}" @@ -47,13 +47,14 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.24.1 +kubernetes_version: 1.25.0 +kubernetes_cri_tools_pkg_version: 1.24.2-00 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap -streamer_rtmp_base_path: /srv/storage/streamer +streamer_rtmp_base_path: /srv/streamer streamer_rtmp_inst_name: feed streamer_rtmp_nginx_image_version: 2022-06-12.26 streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-06-12.26 diff --git a/roles/installer/ubuntu/autoinstall/files/early-command.py b/roles/installer/ubuntu/autoinstall/files/early-command.py index 93d72b2d..0be450c9 100644 --- a/roles/installer/ubuntu/autoinstall/files/early-command.py +++ b/roles/installer/ubuntu/autoinstall/files/early-command.py @@ -15,11 +15,9 @@ try: for c in config['storage']['config']: if 'type' not in c or c['type'] != 'disk' or 'path' not in c: continue - c['path'] = os.path.realpath(c['path']) - - with open('/autoinstall.yaml', 'w') as file: - yaml.dump(config, file, default_flow_style=False) - except KeyError: pass + +with open('/autoinstall.yaml', 'w') as file: + yaml.dump(config, file, default_flow_style=False) diff --git a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 index 8bf62cd5..7add2640 100644 --- a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 +++ b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 @@ -238,7 +238,10 @@ autoinstall: - curtin in-target --target=/target -- sed -e 's/^\(\s*#*\s*Port.*\)/Port {{ ansible_port }}/' -i /etc/ssh/sshd_config {% endif %} - curtin in-target --target=/target -- apt-mark manual iputils-ping isc-dhcp-client netcat-openbsd netplan.io sudo - - curtin in-target --target=/target -- apt-get -y -q purge policykit-1 multipath-tools ubuntu-minimal unattended-upgrades sound-theme-freedesktop thin-provisioning-tools cryptsetup byobu open-iscsi btrfs-progs pollinate lxd-agent-loader open-vm-tools systemd-oomd + - curtin in-target --target=/target -- apt-get -y -q purge policykit-1 multipath-tools ubuntu-minimal unattended-upgrades sound-theme-freedesktop thin-provisioning-tools cryptsetup byobu open-iscsi btrfs-progs pollinate lxd-agent-loader open-vm-tools +{% if ubuntu_installer_codename != 'focal' %} + - curtin in-target --target=/target -- apt-get -y -q purge systemd-oomd +{% endif %} {% if install.disks.primary != "software-raid" %} - curtin in-target --target=/target -- apt-get -y -q purge mdadm {% endif %} |