From c3cd4a20671b5a1313b5eb8e534fd8d1cf67db9f Mon Sep 17 00:00:00 2001 From: zsdc Date: Thu, 18 Mar 2021 17:51:00 +0200 Subject: Multiple build improvements - Removed `empty_config` option. The config should be now always empty because Cloud-init adds required parts dynamically at the first boot. - Added ability to include any additional packages to the image, from list or deb files. - Moved common resources for multiple tasks from tasks folder to `files` and `templates` on the root folder. - Make `trim` actually works. Before this, it actually was a no-op, because RAW image mounted without the `discard` option cannot be trimmed. This significantly reduced the size of images with any additional packages inside, for example with Cloud-init. - Fixed APT repository paths, according to the new structure of `dev.packages.vyos.net`. - Added proper build repository for VyOS 1.3. It used the wrong `current` repo when should be `equuleus` now. - Removed unused `boot/grub/device.map.j2` template. - Deleted a secondary console option from the `grub.cfg.j2` template. According to testing an active console is only the latest listed, so it seems that there is no sense to keep there two items. --- roles/install-guest-agent/tasks/main.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'roles/install-guest-agent/tasks') diff --git a/roles/install-guest-agent/tasks/main.yml b/roles/install-guest-agent/tasks/main.yml index f636f53..3c0985c 100644 --- a/roles/install-guest-agent/tasks/main.yml +++ b/roles/install-guest-agent/tasks/main.yml @@ -6,10 +6,14 @@ set_fact: vyos_branch: "crux" when: vyos_version is regex("^1\.2.*$") +- name: Set VyOS branch name equuleus + set_fact: + vyos_branch: "equuleus" + when: vyos_version is regex("^1\.3.*$") - name: Put debian.list become: true - copy: - src: "files/debian.list.{{ debian_version.stdout }}" + template: + src: "templates/debian.list.j2" dest: "{{ vyos_install_root }}/etc/apt/sources.list.d/debian.list" - name: backup resolv.conf become: true -- cgit v1.2.3