summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
Diffstat (limited to 'roles')
-rw-r--r--roles/install-cloud-init-wrapper/tasks/main.yml2
-rw-r--r--roles/install-cloud-init/tasks/main.yml2
-rw-r--r--roles/install-packages/tasks/main.yml1
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