diff options
| author | Daniil Baturin <daniil@baturin.org> | 2022-10-05 15:48:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-05 15:48:48 +0100 |
| commit | 5ce5635ca676469f95d02a13f9735db5e7f5762b (patch) | |
| tree | 9e493e384beba368c3d6d224f623afb083916d7c | |
| parent | 627bd5562505bee395b771d4db576a773c98b282 (diff) | |
| parent | 32e9525cbc00aa601a98b21b5c0af2bb42ebe7d3 (diff) | |
| download | vyos-vm-images-5ce5635ca676469f95d02a13f9735db5e7f5762b.tar.gz vyos-vm-images-5ce5635ca676469f95d02a13f9735db5e7f5762b.zip | |
Merge pull request #32 from sentrium/current
Small fixes for integration with Ansible Tower
| -rw-r--r-- | roles/install-cloud-init-wrapper/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/install-cloud-init/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/install-packages/tasks/main.yml | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/roles/install-cloud-init-wrapper/tasks/main.yml b/roles/install-cloud-init-wrapper/tasks/main.yml index 7ab9705..6996acb 100644 --- a/roles/install-cloud-init-wrapper/tasks/main.yml +++ b/roles/install-cloud-init-wrapper/tasks/main.yml @@ -1,6 +1,6 @@ - name: Check if we need to install Cloud-Init include_role: - name: install-cloud-init + name: vyos-vm-images/install-cloud-init when: cloud_init == "true" - name: Set Cloud-Init tag for image file name set_fact: diff --git a/roles/install-cloud-init/tasks/main.yml b/roles/install-cloud-init/tasks/main.yml index 7018e8b..db0f6e8 100644 --- a/roles/install-cloud-init/tasks/main.yml +++ b/roles/install-cloud-init/tasks/main.yml @@ -21,7 +21,7 @@ dest: "{{ vyos_install_root }}/etc/resolv.conf" - name: apt-get update become: true - command: chroot {{ vyos_install_root }} apt-get update + command: chroot {{ vyos_install_root }} apt-get -o Acquire::Check-Valid-Until=false update - name: Install cloud-init become: true command: chroot {{ vyos_install_root }} apt-get -t {{ vyos_branch | default('current') }} install -y cloud-init cloud-utils ifupdown diff --git a/roles/install-packages/tasks/main.yml b/roles/install-packages/tasks/main.yml index 6e157dd..f22224f 100644 --- a/roles/install-packages/tasks/main.yml +++ b/roles/install-packages/tasks/main.yml @@ -21,3 +21,4 @@ - squashfs-tools - xorriso state: present + force_apt_get: yes |