Simplify download of OpenShift clients and CoreOS images

The directory structure on the distribution serveris has been stable
for quite some time now, we can rely on it staying the same in the future
as well.

inventory/group_vars/all/software/coreos.yml

@@ -1,83 +1,31 @@
 rhcos_url_prefix: https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos
 fcos_url_prefix: https://builds.coreos.fedoraproject.org/prod/streams/stable/builds
 
+coreos_version_short: '{{ openshift_install_config.coreos_version | regex_replace("^([0-9]+\.[0-9]+)\.[0-9]+$", "\1") }}'
+
 coreos_versions:
   ocp:
-    4.1.0:
-      installer_initramfs_url: '{{ rhcos_url_prefix }}/4.1/4.1.0/rhcos-4.1.0-x86_64-installer-initramfs.img'
-      installer_kernel_url:    '{{ rhcos_url_prefix }}/4.1/4.1.0/rhcos-4.1.0-x86_64-installer-kernel'
-      metal_bios_url:          '{{ rhcos_url_prefix }}/4.1/4.1.0/rhcos-4.1.0-x86_64-metal-bios.raw.gz'
-      vmware_ova_url:          '{{ rhcos_url_prefix }}/4.1/4.1.0/rhcos-4.1.0-x86_64-vmware.ova'
-      checksum:                'sha256:{{ rhcos_url_prefix }}/4.1/4.1.0/sha256sum.txt'
-    4.2.0:
-      installer_initramfs_url: '{{ rhcos_url_prefix }}/4.2/4.2.0/rhcos-4.2.0-x86_64-installer-initramfs.img'
-      installer_kernel_url:    '{{ rhcos_url_prefix }}/4.2/4.2.0/rhcos-4.2.0-x86_64-installer-kernel'
-      metal_bios_url:          '{{ rhcos_url_prefix }}/4.2/4.2.0/rhcos-4.2.0-x86_64-metal-bios.raw.gz'
-      vmware_ova_url:          '{{ rhcos_url_prefix }}/4.2/4.2.0/rhcos-4.2.0-x86_64-vmware.ova'
-      checksum:                'sha256:{{ rhcos_url_prefix }}/4.2/4.2.0/sha256sum.txt'
-    4.3.8:
-      installer_initramfs_url: '{{ rhcos_url_prefix }}/4.3/4.3.8/rhcos-4.3.8-x86_64-installer-initramfs.x86_64.img'
-      installer_kernel_url:    '{{ rhcos_url_prefix }}/4.3/4.3.8/rhcos-4.3.8-x86_64-installer-kernel-x86_64'
-      metal_bios_url:          '{{ rhcos_url_prefix }}/4.3/4.3.8/rhcos-4.3.8-x86_64-metal.x86_64.raw.gz'
-      openstack_qcow2_url:     '{{ rhcos_url_prefix }}/4.3/4.3.8/rhcos-4.3.8-x86_64-openstack.x86_64.qcow2.gz'
-      qemu_qcow2_url:          '{{ rhcos_url_prefix }}/4.3/4.3.8/rhcos-4.3.8-x86_64-qemu.x86_64.qcow2.gz'
-      vmware_ova_url:          '{{ rhcos_url_prefix }}/4.3/4.3.8/rhcos-4.3.8-x86_64-vmware.x86_64.ova'
-      checksum:                'sha256:{{ rhcos_url_prefix }}/4.3/4.3.8/sha256sum.txt'
-    4.4.3:
-      installer_initramfs_url: '{{ rhcos_url_prefix }}/4.4/4.4.3/rhcos-4.4.3-x86_64-installer-initramfs.x86_64.img'
-      installer_kernel_url:    '{{ rhcos_url_prefix }}/4.4/4.4.3/rhcos-4.4.3-x86_64-installer-kernel-x86_64'
-      metal_bios_url:          '{{ rhcos_url_prefix }}/4.4/4.4.3/rhcos-4.4.3-x86_64-metal.x86_64.raw.gz'
-      openstack_qcow2_url:     '{{ rhcos_url_prefix }}/4.4/4.4.3/rhcos-4.4.3-x86_64-openstack.x86_64.qcow2.gz'
-      qemu_qcow2_url:          '{{ rhcos_url_prefix }}/4.4/4.4.3/rhcos-4.4.3-x86_64-qemu.x86_64.qcow2.gz'
-      vmware_ova_url:          '{{ rhcos_url_prefix }}/4.4/4.4.3/rhcos-4.4.3-x86_64-vmware.x86_64.ova'
-      checksum:                'sha256:{{ rhcos_url_prefix }}/4.4/4.4.3/sha256sum.txt'
-    4.5.2:
-      installer_initramfs_url: '{{ rhcos_url_prefix }}/4.5/4.5.2/rhcos-4.5.2-x86_64-installer-initramfs.x86_64.img'
-      installer_kernel_url:    '{{ rhcos_url_prefix }}/4.5/4.5.2/rhcos-4.5.2-x86_64-installer-kernel-x86_64'
-      metal_bios_url:          '{{ rhcos_url_prefix }}/4.5/4.5.2/rhcos-4.5.2-x86_64-metal.x86_64.raw.gz'
-      openstack_qcow2_url:     '{{ rhcos_url_prefix }}/4.5/4.5.2/rhcos-4.5.2-x86_64-openstack.x86_64.qcow2.gz'
-      qemu_qcow2_url:          '{{ rhcos_url_prefix }}/4.5/4.5.2/rhcos-4.5.2-x86_64-qemu.x86_64.qcow2.gz'
-      vmware_ova_url:          '{{ rhcos_url_prefix }}/4.5/4.5.2/rhcos-4.5.2-x86_64-vmware.x86_64.ova'
-      checksum:                'sha256:{{ rhcos_url_prefix }}/4.5/4.5.2/sha256sum.txt'
-    4.6.1:
-      installer_initramfs_url: '{{ rhcos_url_prefix }}/4.6/4.6.1/rhcos-4.6.1-x86_64-installer-initramfs.x86_64.img'
-      installer_kernel_url:    '{{ rhcos_url_prefix }}/4.6/4.6.1/rhcos-4.6.1-x86_64-installer-kernel-x86_64'
-      metal_bios_url:          '{{ rhcos_url_prefix }}/4.6/4.6.1/rhcos-4.6.1-x86_64-metal.x86_64.raw.gz'
-      openstack_qcow2_url:     '{{ rhcos_url_prefix }}/4.6/4.6.1/rhcos-4.6.1-x86_64-openstack.x86_64.qcow2.gz'
-      qemu_qcow2_url:          '{{ rhcos_url_prefix }}/4.6/4.6.1/rhcos-4.6.1-x86_64-qemu.x86_64.qcow2.gz'
-      vmware_ova_url:          '{{ rhcos_url_prefix }}/4.6/4.6.1/rhcos-4.6.1-x86_64-vmware.x86_64.ova'
-      checksum:                'sha256:{{ rhcos_url_prefix }}/4.6/4.6.1/sha256sum.txt'
-    4.7.7:
-      installer_initramfs_url: '{{ rhcos_url_prefix }}/4.7/4.7.7/rhcos-4.7.7-x86_64-installer-initramfs.x86_64.img'
-      installer_kernel_url:    '{{ rhcos_url_prefix }}/4.7/4.7.7/rhcos-4.7.7-x86_64-installer-kernel-x86_64'
-      metal_bios_url:          '{{ rhcos_url_prefix }}/4.7/4.7.7/rhcos-4.7.7-x86_64-metal.x86_64.raw.gz'
-      openstack_qcow2_url:     '{{ rhcos_url_prefix }}/4.7/4.7.7/rhcos-4.7.7-x86_64-openstack.x86_64.qcow2.gz'
-      qemu_qcow2_url:          '{{ rhcos_url_prefix }}/4.7/4.7.7/rhcos-4.7.7-x86_64-qemu.x86_64.qcow2.gz'
-      vmware_ova_url:          '{{ rhcos_url_prefix }}/4.7/4.7.7/rhcos-4.7.7-x86_64-vmware.x86_64.ova'
-      checksum:                'sha256:{{ rhcos_url_prefix }}/4.7/4.7.7/sha256sum.txt'
+    installer_initramfs_url: '{{ rhcos_url_prefix }}/{{ coreos_version_short }}/{{ openshift_install_config.coreos_version }}/rhcos-{{ openshift_install_config.coreos_version }}-x86_64-installer-initramfs.x86_64.img'
+    installer_kernel_url:    '{{ rhcos_url_prefix }}/{{ coreos_version_short }}/{{ openshift_install_config.coreos_version }}/rhcos-{{ openshift_install_config.coreos_version }}-x86_64-installer-kernel-x86_64'
+    metal_bios_url:          '{{ rhcos_url_prefix }}/{{ coreos_version_short }}/{{ openshift_install_config.coreos_version }}/rhcos-{{ openshift_install_config.coreos_version }}-x86_64-metal.x86_64.raw.gz'
+    openstack_qcow2_url:     '{{ rhcos_url_prefix }}/{{ coreos_version_short }}/{{ openshift_install_config.coreos_version }}/rhcos-{{ openshift_install_config.coreos_version }}-x86_64-openstack.x86_64.qcow2.gz'
+    qemu_qcow2_url:          '{{ rhcos_url_prefix }}/{{ coreos_version_short }}/{{ openshift_install_config.coreos_version }}/rhcos-{{ openshift_install_config.coreos_version }}-x86_64-qemu.x86_64.qcow2.gz'
+    vmware_ova_url:          '{{ rhcos_url_prefix }}/{{ coreos_version_short }}/{{ openshift_install_config.coreos_version }}/rhcos-{{ openshift_install_config.coreos_version }}-x86_64-vmware.x86_64.ova'
+    checksum:                'sha256:{{ rhcos_url_prefix }}/{{ coreos_version_short }}/{{ openshift_install_config.coreos_version }}/sha256sum.txt'
   okd:
-    32.20200629.3.0:
-      installer_initramfs_url: '{{ fcos_url_prefix }}/32.20200629.3.0/x86_64/fedora-coreos-32.20200629.3.0-live-initramfs.x86_64.img'
-      installer_kernel_url:    '{{ fcos_url_prefix }}/32.20200629.3.0/x86_64/fedora-coreos-32.20200629.3.0-live-kernel-x86_64'
-      metal_bios_url:          '{{ fcos_url_prefix }}/32.20200629.3.0/x86_64/fedora-coreos-32.20200629.3.0-metal.x86_64.raw.xz'
-      openstack_qcow2_url:     '{{ fcos_url_prefix }}/32.20200629.3.0/x86_64/fedora-coreos-32.20200629.3.0-openstack.x86_64.qcow2.xz'
-      qemu_qcow2_url:          '{{ fcos_url_prefix }}/32.20200629.3.0/x86_64/fedora-coreos-32.20200629.3.0-qemu.x86_64.qcow2.xz'
-      vmware_ova_url:          '{{ fcos_url_prefix }}/32.20200629.3.0/x86_64/fedora-coreos-32.20200629.3.0-vmware.x86_64.ova'
-      checksum:                ''
-    33.20210117.3.2:
-      installer_initramfs_url: '{{ fcos_url_prefix }}/33.20210117.3.2/x86_64/fedora-coreos-33.20210117.3.2-live-initramfs.x86_64.img'
-      installer_kernel_url:    '{{ fcos_url_prefix }}/33.20210117.3.2/x86_64/fedora-coreos-33.20210117.3.2-live-kernel-x86_64'
-      metal_bios_url:          '{{ fcos_url_prefix }}/33.20210117.3.2/x86_64/fedora-coreos-33.20210117.3.2-metal.x86_64.raw.xz'
-      openstack_qcow2_url:     '{{ fcos_url_prefix }}/33.20210117.3.2/x86_64/fedora-coreos-33.20210117.3.2-openstack.x86_64.qcow2.xz'
-      qemu_qcow2_url:          '{{ fcos_url_prefix }}/33.20210117.3.2/x86_64/fedora-coreos-33.20210117.3.2-qemu.x86_64.qcow2.xz'
-      vmware_ova_url:          '{{ fcos_url_prefix }}/33.20210117.3.2/x86_64/fedora-coreos-33.20210117.3.2-vmware.x86_64.ova'
-      checksum:                ''
+    installer_initramfs_url: '{{ fcos_url_prefix }}/{{ openshift_install_config.coreos_version }}/x86_64/fedora-coreos-{{ openshift_install_config.coreos_version }}-live-initramfs.x86_64.img'
+    installer_kernel_url:    '{{ fcos_url_prefix }}/{{ openshift_install_config.coreos_version }}/x86_64/fedora-coreos-{{ openshift_install_config.coreos_version }}-live-kernel-x86_64'
+    metal_bios_url:          '{{ fcos_url_prefix }}/{{ openshift_install_config.coreos_version }}/x86_64/fedora-coreos-{{ openshift_install_config.coreos_version }}-metal.x86_64.raw.xz'
+    openstack_qcow2_url:     '{{ fcos_url_prefix }}/{{ openshift_install_config.coreos_version }}/x86_64/fedora-coreos-{{ openshift_install_config.coreos_version }}-openstack.x86_64.qcow2.xz'
+    qemu_qcow2_url:          '{{ fcos_url_prefix }}/{{ openshift_install_config.coreos_version }}/x86_64/fedora-coreos-{{ openshift_install_config.coreos_version }}-qemu.x86_64.qcow2.xz'
+    vmware_ova_url:          '{{ fcos_url_prefix }}/{{ openshift_install_config.coreos_version }}/x86_64/fedora-coreos-{{ openshift_install_config.coreos_version }}-vmware.x86_64.ova'
+    checksum:                ''
 
 coreos:
-  installer_initramfs_url: '{{ coreos_versions[openshift_install_config.distribution][openshift_install_config.coreos_version].installer_initramfs_url }}'
-  installer_kernel_url:    '{{ coreos_versions[openshift_install_config.distribution][openshift_install_config.coreos_version].installer_kernel_url }}'
-  metal_bios_url:          '{{ coreos_versions[openshift_install_config.distribution][openshift_install_config.coreos_version].metal_bios_url }}'
-  openstack_qcow2_url:     '{{ coreos_versions[openshift_install_config.distribution][openshift_install_config.coreos_version].openstack_qcow2_url }}'
-  qemu_qcow2_url:          '{{ coreos_versions[openshift_install_config.distribution][openshift_install_config.coreos_version].qemu_qcow2_url }}'
-  vmware_ova_url:          '{{ coreos_versions[openshift_install_config.distribution][openshift_install_config.coreos_version].vmware_ova_url }}'
-  checksum:                '{{ coreos_versions[openshift_install_config.distribution][openshift_install_config.coreos_version].checksum }}'
+  installer_initramfs_url: '{{ coreos_versions[openshift_install_config.distribution].installer_initramfs_url }}'
+  installer_kernel_url:    '{{ coreos_versions[openshift_install_config.distribution].installer_kernel_url }}'
+  metal_bios_url:          '{{ coreos_versions[openshift_install_config.distribution].metal_bios_url }}'
+  openstack_qcow2_url:     '{{ coreos_versions[openshift_install_config.distribution].openstack_qcow2_url }}'
+  qemu_qcow2_url:          '{{ coreos_versions[openshift_install_config.distribution].qemu_qcow2_url }}'
+  vmware_ova_url:          '{{ coreos_versions[openshift_install_config.distribution].vmware_ova_url }}'
+  checksum:                '{{ coreos_versions[openshift_install_config.distribution].checksum }}'

inventory/group_vars/all/software/openshift_client.yml

@@ -3,35 +3,12 @@ okd_client_url_prefix: 'https://github.com/openshift/okd/releases/download'
 
 openshift_client_versions:
   ocp:
-    4.1.0:
-      archive_url:   '{{ ocp_client_url_prefix }}/4.1.0/openshift-client-linux-4.1.0.tar.gz'
-      sha256sum_url: '{{ ocp_client_url_prefix }}/4.1.0/sha256sum.txt'
-    4.2.0:
-      archive_url:   '{{ ocp_client_url_prefix }}/4.2.0/openshift-client-linux-4.2.0.tar.gz'
-      sha256sum_url: '{{ ocp_client_url_prefix }}/4.2.0/sha256sum.txt'
-    4.3.23:
-      archive_url:   '{{ ocp_client_url_prefix }}/4.3.23/openshift-client-linux-4.3.23.tar.gz'
-      sha256sum_url: '{{ ocp_client_url_prefix }}/4.3.23/sha256sum.txt'
-    4.4.6:
-      archive_url:   '{{ ocp_client_url_prefix }}/4.4.6/openshift-client-linux-4.4.6.tar.gz'
-      sha256sum_url: '{{ ocp_client_url_prefix }}/4.4.6/sha256sum.txt'
-    4.5.4:
-      archive_url:   '{{ ocp_client_url_prefix }}/4.5.4/openshift-client-linux-4.5.4.tar.gz'
-      sha256sum_url: '{{ ocp_client_url_prefix }}/4.5.4/sha256sum.txt'
-    4.6.1:
-      archive_url:   '{{ ocp_client_url_prefix }}/4.6.1/openshift-client-linux-4.6.1.tar.gz'
-      sha256sum_url: '{{ ocp_client_url_prefix }}/4.6.1/sha256sum.txt'
-    4.7.13:
-      archive_url:   '{{ ocp_client_url_prefix }}/4.7.13/openshift-client-linux-4.7.13.tar.gz'
-      sha256sum_url: '{{ ocp_client_url_prefix }}/4.7.13/sha256sum.txt'
+    archive_url:   '{{ ocp_client_url_prefix }}/{{ openshift_install_config.version }}/openshift-client-linux-{{ openshift_install_config.version }}.tar.gz'
+    sha256sum_url: '{{ ocp_client_url_prefix }}/{{ openshift_install_config.version }}/sha256sum.txt'
   okd:
-    4.5.0-0.okd-2020-07-14-153706-ga:
-      archive_url:   '{{ okd_client_url_prefix }}/4.5.0-0.okd-2020-07-14-153706-ga/openshift-client-linux-4.5.0-0.okd-2020-07-14-153706-ga.tar.gz'
-      sha256sum_url: '{{ okd_client_url_prefix }}/4.5.0-0.okd-2020-07-14-153706-ga/sha256sum.txt'
-    4.7.0-0.okd-2021-06-04-191031:
-      archive_url:   '{{ okd_client_url_prefix }}/4.7.0-0.okd-2021-06-04-191031/openshift-client-linux-4.7.0-0.okd-2021-06-04-191031.tar.gz'
-      sha256sum_url: '{{ okd_client_url_prefix }}/4.7.0-0.okd-2021-06-04-191031/sha256sum.txt'
+    archive_url:   '{{ okd_client_url_prefix }}/{{ openshift_install_config.version }}/openshift-client-linux-{{ openshift_install_config.version }}.tar.gz'
+    sha256sum_url: '{{ okd_client_url_prefix }}/{{ openshift_install_config.version }}/sha256sum.txt'
 
 openshift_client:
-  archive_url:   '{{ openshift_client_versions[openshift_install_config.distribution][openshift_install_config.version].archive_url }}'
-  sha256sum_url: '{{ openshift_client_versions[openshift_install_config.distribution][openshift_install_config.version].sha256sum_url }}'
+  archive_url:   '{{ openshift_client_versions[openshift_install_config.distribution].archive_url }}'
+  sha256sum_url: '{{ openshift_client_versions[openshift_install_config.distribution].sha256sum_url }}'

inventory/group_vars/all/software/openshift_installer.yml

@@ -3,35 +3,12 @@ okd_installer_url_prefix: 'https://github.com/openshift/okd/releases/download'
 
 openshift_installer_versions:
   ocp:
-    4.1.0:
-      archive_url:   '{{ ocp_installer_url_prefix }}/4.1.0/openshift-install-linux-4.1.0.tar.gz'
-      sha256sum_url: '{{ ocp_installer_url_prefix }}/4.1.0/sha256sum.txt'
-    4.2.0:
-      archive_url:   '{{ ocp_installer_url_prefix }}/4.2.0/openshift-install-linux-4.2.0.tar.gz'
-      sha256sum_url: '{{ ocp_installer_url_prefix }}/4.2.0/sha256sum.txt'
-    4.3.23:
-      archive_url:   '{{ ocp_installer_url_prefix }}/4.3.23/openshift-install-linux-4.3.23.tar.gz'
-      sha256sum_url: '{{ ocp_installer_url_prefix }}/4.3.23/sha256sum.txt'
-    4.4.6:
-      archive_url:   '{{ ocp_installer_url_prefix }}/4.4.6/openshift-install-linux-4.4.6.tar.gz'
-      sha256sum_url: '{{ ocp_installer_url_prefix }}/4.4.6/sha256sum.txt'
-    4.5.4:
-      archive_url:   '{{ ocp_installer_url_prefix }}/4.5.4/openshift-install-linux-4.5.4.tar.gz'
-      sha256sum_url: '{{ ocp_installer_url_prefix }}/4.5.4/sha256sum.txt'
-    4.6.1:
-      archive_url:   '{{ ocp_installer_url_prefix }}/4.6.1/openshift-install-linux-4.6.1.tar.gz'
-      sha256sum_url: '{{ ocp_installer_url_prefix }}/4.6.1/sha256sum.txt'
-    4.7.13:
-      archive_url:   '{{ ocp_installer_url_prefix }}/4.7.13/openshift-install-linux-4.7.13.tar.gz'
-      sha256sum_url: '{{ ocp_installer_url_prefix }}/4.7.13/sha256sum.txt'
+    archive_url:   '{{ ocp_installer_url_prefix }}/{{ openshift_install_config.version }}/openshift-install-linux-{{ openshift_install_config.version }}.tar.gz'
+    sha256sum_url: '{{ ocp_installer_url_prefix }}/{{ openshift_install_config.version }}/sha256sum.txt'
   okd:
-    4.5.0-0.okd-2020-07-14-153706-ga:
-      archive_url:   '{{ okd_installer_url_prefix }}/4.5.0-0.okd-2020-07-14-153706-ga/openshift-install-linux-4.5.0-0.okd-2020-07-14-153706-ga.tar.gz'
-      sha256sum_url: '{{ okd_installer_url_prefix }}/4.5.0-0.okd-2020-07-14-153706-ga/sha256sum.txt'
-    4.7.0-0.okd-2021-06-04-191031:
-      archive_url:   '{{ okd_installer_url_prefix }}/4.7.0-0.okd-2021-06-04-191031/openshift-install-linux-4.7.0-0.okd-2021-06-04-191031.tar.gz'
-      sha256sum_url: '{{ okd_installer_url_prefix }}/4.7.0-0.okd-2021-06-04-191031/sha256sum.txt'
+    archive_url:   '{{ okd_installer_url_prefix }}/{{ openshift_install_config.version }}/openshift-install-linux-{{ openshift_install_config.version }}.tar.gz'
+    sha256sum_url: '{{ okd_installer_url_prefix }}/{{ openshift_install_config.version }}/sha256sum.txt'
 
 openshift_installer:
-  archive_url:   '{{ openshift_installer_versions[openshift_install_config.distribution][openshift_install_config.version].archive_url }}'
-  sha256sum_url: '{{ openshift_installer_versions[openshift_install_config.distribution][openshift_install_config.version].sha256sum_url }}'
+  archive_url:   '{{ openshift_installer_versions[openshift_install_config.distribution].archive_url }}'
+  sha256sum_url: '{{ openshift_installer_versions[openshift_install_config.distribution].sha256sum_url }}'