diff options
| author | zsdc <taras@vyos.io> | 2021-03-18 17:51:00 +0200 |
|---|---|---|
| committer | zsdc <taras@vyos.io> | 2021-03-18 17:51:00 +0200 |
| commit | c3cd4a20671b5a1313b5eb8e534fd8d1cf67db9f (patch) | |
| tree | 577c07b3d85f531ce6704e367c4a29f6e9a2427e /roles/install-guest-agent | |
| parent | c084415cff751d488d1460e58203ade538aea754 (diff) | |
| download | vyos-vm-images-c3cd4a20671b5a1313b5eb8e534fd8d1cf67db9f.tar.gz vyos-vm-images-c3cd4a20671b5a1313b5eb8e534fd8d1cf67db9f.zip | |
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.
Diffstat (limited to 'roles/install-guest-agent')
| -rw-r--r-- | roles/install-guest-agent/files/debian.list.buster | 4 | ||||
| -rw-r--r-- | roles/install-guest-agent/files/debian.list.jessie | 5 | ||||
| -rw-r--r-- | roles/install-guest-agent/files/resolv.conf | 1 | ||||
| -rw-r--r-- | roles/install-guest-agent/tasks/main.yml | 8 |
4 files changed, 6 insertions, 12 deletions
diff --git a/roles/install-guest-agent/files/debian.list.buster b/roles/install-guest-agent/files/debian.list.buster deleted file mode 100644 index 4950c4e..0000000 --- a/roles/install-guest-agent/files/debian.list.buster +++ /dev/null @@ -1,4 +0,0 @@ -deb http://deb.debian.org/debian buster main contrib non-free -deb http://security.debian.org/debian-security/ buster/updates main contrib non-free -deb http://deb.debian.org/debian buster-updates main contrib non-free -deb http://dev.packages.vyos.net/repositories/current current main diff --git a/roles/install-guest-agent/files/debian.list.jessie b/roles/install-guest-agent/files/debian.list.jessie deleted file mode 100644 index 885e26b..0000000 --- a/roles/install-guest-agent/files/debian.list.jessie +++ /dev/null @@ -1,5 +0,0 @@ -deb http://deb.debian.org/debian jessie main contrib non-free -deb http://security.debian.org/debian-security/ jessie/updates main contrib non-free -deb http://deb.debian.org/debian jessie-updates main contrib non-free -deb http://dev.packages.vyos.net/repositories/crux/vyos crux main -deb http://dev.packages.vyos.net/repositories/crux/debian crux main diff --git a/roles/install-guest-agent/files/resolv.conf b/roles/install-guest-agent/files/resolv.conf deleted file mode 100644 index 81027f8..0000000 --- a/roles/install-guest-agent/files/resolv.conf +++ /dev/null @@ -1 +0,0 @@ -nameserver 1.1.1.1
\ No newline at end of file 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 |