diff options
| author | Yuya Kusakabe <yuya.kusakabe@gmail.com> | 2022-10-14 04:54:34 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-14 04:54:34 +0900 |
| commit | ba10a1f447a058404fcd58668e2cf4bb1be5ed30 (patch) | |
| tree | acca5fcc6c432ac63d7acaf3d4804760f8a13718 /roles | |
| parent | 5ce5635ca676469f95d02a13f9735db5e7f5762b (diff) | |
| parent | b2e0c29174573f072d94235cbe782ba66de70100 (diff) | |
| download | vyos-vm-images-ba10a1f447a058404fcd58668e2cf4bb1be5ed30.tar.gz vyos-vm-images-ba10a1f447a058404fcd58668e2cf4bb1be5ed30.zip | |
Merge pull request #33 from sentrium/revert-32-current
Revert "Small fixes for integration with Ansible Tower"
Diffstat (limited to 'roles')
| -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, 2 insertions, 3 deletions
diff --git a/roles/install-cloud-init-wrapper/tasks/main.yml b/roles/install-cloud-init-wrapper/tasks/main.yml index 6996acb..7ab9705 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: vyos-vm-images/install-cloud-init + name: 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 db0f6e8..7018e8b 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 -o Acquire::Check-Valid-Until=false update + command: chroot {{ vyos_install_root }} apt-get 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 f22224f..6e157dd 100644 --- a/roles/install-packages/tasks/main.yml +++ b/roles/install-packages/tasks/main.yml @@ -21,4 +21,3 @@ - squashfs-tools - xorriso state: present - force_apt_get: yes |