diff options
Diffstat (limited to 'roles/installer/ubuntu/autoinstall')
| -rw-r--r-- | roles/installer/ubuntu/autoinstall/defaults/main.yml | 3 | ||||
| -rw-r--r-- | roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/roles/installer/ubuntu/autoinstall/defaults/main.yml b/roles/installer/ubuntu/autoinstall/defaults/main.yml index 51ac6114..50a35ae1 100644 --- a/roles/installer/ubuntu/autoinstall/defaults/main.yml +++ b/roles/installer/ubuntu/autoinstall/defaults/main.yml @@ -39,7 +39,4 @@ ubuntu_autoinstall_system_lvm_volumes_default: - noexec -ubuntu_autoinstall_apt_arches: - - amd64 - ubuntu_autoinstall_install_tasks: [] diff --git a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 index 98d6699b..93b952b6 100644 --- a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 +++ b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 @@ -203,7 +203,8 @@ autoinstall: apt: primary: - uri: http://{{ apt_repo_providers[apt_repo_provider].ubuntu.host }}{{ apt_repo_providers[apt_repo_provider].ubuntu.path }} - arches: {{ ubuntu_autoinstall_apt_arches | to_json}} + arches: + - amd64 user-data: hostname: "{{ host_name }}" @@ -249,9 +250,7 @@ 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-get -y -q purge multipath-tools open-vm-tools -{% if ubuntu_installer_codename != 'focal' %} - curtin in-target --target=/target -- apt-get -y -q purge systemd-oomd -{% endif %} {% if ubuntu_autoinstall_desktop is undefined %} - 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 ubuntu-minimal unattended-upgrades sound-theme-freedesktop thin-provisioning-tools cryptsetup byobu open-iscsi btrfs-progs pollinate lxd-agent-loader |