3 files changed, 37 insertions, 4 deletions
diff --git a/roles/installer/debian/base/defaults/main.yml b/roles/installer/debian/base/defaults/main.yml
index 8962e9ad..39fc787d 100644
--- a/roles/installer/debian/base/defaults/main.yml
+++ b/roles/installer/debian/base/defaults/main.yml
@@ -15,8 +15,14 @@ distros:
     arch:
       - amd64
       - i386
+  - distro: ubuntu
+    codename: focal
+    arch:
+      - amd64
 
 debian_installer_force_download: no
 debian_installer_url:
-  debian: "https://debian.ffgraz.net/debian"
-  ubuntu: "https://debian.ffgraz.net/ubuntu"
+#  debian: "https://debian.ffgraz.net/debian"
+#  ubuntu: "https://debian.ffgraz.net/ubuntu"
+  debian: "http://deb.debian.org/debian"
+  ubuntu: "http://archive.ubuntu.com/ubuntu"
diff --git a/roles/installer/debian/base/filter_plugins/main.py b/roles/installer/debian/base/filter_plugins/main.py
new file mode 100644
index 00000000..298e7efd
--- /dev/null
+++ b/roles/installer/debian/base/filter_plugins/main.py
@@ -0,0 +1,27 @@
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+from ansible import errors
+
+
+def di_images_path(data):
+    try:
+        if data[0] != 'ubuntu':
+            return 'images'
+
+        if data[1] in ['xenial', 'bionic']:
+            return 'images'
+
+        return 'legacy-images'
+    except Exception as e:
+        raise errors.AnsibleFilterError("mountpoint_exists(): %s" % str(e))
+
+
+class FilterModule(object):
+
+    filter_map = {
+        'di_images_path': di_images_path,
+    }
+
+    def filters(self):
+        return self.filter_map
diff --git a/roles/installer/debian/base/tasks/main.yml b/roles/installer/debian/base/tasks/main.yml
index 92fac536..8ce494ae 100644
--- a/roles/installer/debian/base/tasks/main.yml
+++ b/roles/installer/debian/base/tasks/main.yml
@@ -11,7 +11,7 @@
   loop_control:
     label: "{{ item.0.distro }}/{{ item.0.codename }} {{ item.1 }}"
   get_url:
-    url: "{{ debian_installer_url[item.0.distro] }}/dists/{{ item.0.codename }}/main/installer-{{ item.1 }}/current/images/netboot/{{ item.0.distro }}-installer/{{ item.1 }}/linux"
+    url: "{{ debian_installer_url[item.0.distro] }}/dists/{{ item.0.codename }}/main/installer-{{ item.1 }}/current/{{ [item.0.distro, item.0.codename] | di_images_path }}/netboot/{{ item.0.distro }}-installer/{{ item.1 }}/linux"
     dest: "{{ installer_path }}/{{ item.0.distro }}-{{ item.0.codename }}/{{ item.1 }}/linux"
     mode: 0644
     force: "{{ debian_installer_force_download }}"
@@ -21,7 +21,7 @@
   loop_control:
     label: "{{ item.0.distro }}/{{ item.0.codename }} {{ item.1 }}"
   get_url:
-    url: "{{ debian_installer_url[item.0.distro] }}/dists/{{ item.0.codename }}/main/installer-{{ item.1 }}/current/images/netboot/{{ item.0.distro }}-installer/{{ item.1 }}/initrd.gz"
+    url: "{{ debian_installer_url[item.0.distro] }}/dists/{{ item.0.codename }}/main/installer-{{ item.1 }}/current/{{ [item.0.distro, item.0.codename] | di_images_path }}/netboot/{{ item.0.distro }}-installer/{{ item.1 }}/initrd.gz"
     dest: "{{ installer_path }}/{{ item.0.distro }}-{{ item.0.codename }}/{{ item.1 }}/initrd.gz"
     mode: 0644
     force: "{{ debian_installer_force_download }}"