Skip to content

Commit

Permalink
Update Rocky Linux 9 ISO URLs (#1464)
Browse files Browse the repository at this point in the history
* Update rocky 9 URL

* Test cloud-init version for Guestinfo
  • Loading branch information
0nebody authored May 10, 2024
1 parent ca8ad72 commit 50a070a
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 20 deletions.
43 changes: 27 additions & 16 deletions images/capi/ansible/roles/providers/tasks/vmware-redhat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@
- cloud-init
- cloud-utils-growpart

- name: Get package facts
ansible.builtin.package_facts:
manager: "auto"

- name: Set cloud-init version
ansible.builtin.set_fact:
cloud_init_version: "{{ ansible_facts.packages['cloud-init'][0].version }}"

- name: Install python2 pip
ansible.builtin.yum:
name: "{{ packages }}"
Expand All @@ -41,19 +49,22 @@

# Directly installing Guestinfo datasource is needed so long as
# cloud-init is < 21.3
- name: Download cloud-init datasource for VMware Guestinfo
ansible.builtin.get_url:
url: "{{ guestinfo_datasource_script }}"
dest: /tmp/cloud-init-vmware.sh
mode: "0700"

- name: Execute cloud-init-vmware.sh
ansible.builtin.shell: bash -o errexit -o pipefail /tmp/cloud-init-vmware.sh
environment:
REPO_SLUG: "{{ guestinfo_datasource_slug }}"
GIT_REF: "{{ guestinfo_datasource_ref }}"

- name: Remove cloud-init-vmware.sh
ansible.builtin.file:
path: /tmp/cloud-init-vmware.sh
state: absent
- name: Directly install Guestinfo
when: cloud_init_version is version('21.3', '<')
block:
- name: Download cloud-init datasource for VMware Guestinfo
ansible.builtin.get_url:
url: "{{ guestinfo_datasource_script }}"
dest: /tmp/cloud-init-vmware.sh
mode: "0700"

- name: Execute cloud-init-vmware.sh
ansible.builtin.shell: bash -o errexit -o pipefail /tmp/cloud-init-vmware.sh
environment:
REPO_SLUG: "{{ guestinfo_datasource_slug }}"
GIT_REF: "{{ guestinfo_datasource_ref }}"

- name: Remove cloud-init-vmware.sh
ansible.builtin.file:
path: /tmp/cloud-init-vmware.sh
state: absent
4 changes: 2 additions & 2 deletions images/capi/packer/ova/rockylinux-9.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"epel_rpm_gpg_key": "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-9",
"firmware": "efi",
"guest_os_type": "rockylinux-64",
"iso_checksum": "eef8d26018f4fcc0dc101c468f65cbf588f2184900c556f243802e9698e56729",
"iso_checksum": "ee3ac97fdffab58652421941599902012179c37535aece76824673105169c4a2",
"iso_checksum_type": "sha256",
"iso_url": "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.3-x86_64-minimal.iso",
"iso_url": "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.4-x86_64-minimal.iso",
"os_display_name": "RockyLinux 9",
"redhat_epel_rpm": "https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm",
"shutdown_command": "/sbin/halt -h -p",
Expand Down
4 changes: 2 additions & 2 deletions images/capi/packer/qemu/qemu-rockylinux-9.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"distro_version": "9",
"epel_rpm_gpg_key": "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-9",
"guest_os_type": "centos9-64",
"iso_checksum": "eef8d26018f4fcc0dc101c468f65cbf588f2184900c556f243802e9698e56729",
"iso_checksum": "ee3ac97fdffab58652421941599902012179c37535aece76824673105169c4a2",
"iso_checksum_type": "sha256",
"iso_url": "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.3-x86_64-minimal.iso",
"iso_url": "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.4-x86_64-minimal.iso",
"os_display_name": "RockyLinux 9",
"redhat_epel_rpm": "https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm",
"shutdown_command": "/sbin/halt -h -p"
Expand Down

0 comments on commit 50a070a

Please sign in to comment.