Преглед на файлове

Generate channel urls for CoreOS

URL contains channel name and version so have
to generate the URL properly.
Antony Messerli преди 4 години
родител
ревизия
998041a10e
променени са 2 файла, в които са добавени 8 реда и са изтрити 5 реда
  1. 4 4
      roles/netbootxyz/defaults/main.yml
  2. 4 1
      roles/netbootxyz/templates/menu/coreos.ipxe.j2

+ 4 - 4
roles/netbootxyz/defaults/main.yml

@@ -131,18 +131,18 @@ releases:
     - code_name: 7
       name: 7.x Latest
   coreos:
-    base_dir: prod/streams/stable/builds
+    base_dir: prod/streams
     enabled: true
     menu: linux
     mirror: https://builds.coreos.fedoraproject.org
     name: Fedora CoreOS
     versions:
     - code_name: 32.20200629.3.0
-      name: Stable
+      name: stable
     - code_name: 32.20200629.2.0
-      name: Testing
+      name: testing
     - code_name: 32.20200625.1.0
-      name: Next
+      name: next
   debian:
     archive_mirror: http://archive.debian.org
     base_dir: debian

+ 4 - 1
roles/netbootxyz/templates/menu/coreos.ipxe.j2

@@ -25,7 +25,10 @@ goto core_boot ||
 goto coreos_exit
 
 :core_boot
-set base_url ${coreos_mirror}/${coreos_base_dir}
+{% for item in releases.coreos.versions %}
+iseq ${core_version} {{ item.code_name }} && set coreos_channel {{ item.name }} ||
+{% endfor %}
+set base_url ${coreos_mirror}/${coreos_base_dir}/${coreos_channel}/builds
 set build_version ${core_version}
 imgfree
 kernel ${base_url}/${build_version}/x86_64/fedora-coreos-${build_version}-live-kernel-x86_64 ip=dhcp rd.neednet=1 coreos.inst.install_dev=${install_device} coreos.inst.ignition_url=${ignition_url} ${console} initrd=fedora-coreos-${build_version}-live-initramfs.x86_64.img