From 0030c5f1ed5aeac7d991187b1761e0f664c3669a Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Mon, 4 Jul 2022 18:24:37 +0200
Subject: [PATCH] Update to latest Rocky Linux cloud image

The 8.5 image has moved to the Rocky Linux Vault.

Change-Id: I86c92a1b0b8cf5e4dc534e04709e38bd90f7660e
---
 ansible/group_vars/all/infra-vms                             | 4 ++--
 ansible/group_vars/all/seed-vm                               | 4 ++--
 etc/kayobe/infra-vms.yml                                     | 2 +-
 etc/kayobe/seed-vm.yml                                       | 2 +-
 .../notes/rocky-linux-8.6-image-cb4cf2781f802fb1.yaml        | 5 +++++
 5 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 releasenotes/notes/rocky-linux-8.6-image-cb4cf2781f802fb1.yaml

diff --git a/ansible/group_vars/all/infra-vms b/ansible/group_vars/all/infra-vms
index 859eb046..26b426f8 100644
--- a/ansible/group_vars/all/infra-vms
+++ b/ansible/group_vars/all/infra-vms
@@ -43,7 +43,7 @@ infra_vm_root_format: qcow2
 # Base image for the infra VM root volume. Default is
 # "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
 # when os_distribution is "ubuntu", or
-# http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
+# https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2
 # when os_distribution is "rocky",
 # or
 # "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
@@ -52,7 +52,7 @@ infra_vm_root_image: >-
   {%- if os_distribution == 'ubuntu' %}
   https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
   {%- elif os_distribution == 'rocky' %}
-  http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
+  https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2
   {%- else -%}
   https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2
   {%- endif %}
diff --git a/ansible/group_vars/all/seed-vm b/ansible/group_vars/all/seed-vm
index fb865840..ea6291b3 100644
--- a/ansible/group_vars/all/seed-vm
+++ b/ansible/group_vars/all/seed-vm
@@ -43,7 +43,7 @@ seed_vm_root_format: qcow2
 # Base image for the seed VM root volume. Default is
 # "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
 # when os_distribution is "ubuntu",
-# http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
+# https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2
 # when os_distribution is "rocky",
 # or
 # "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
@@ -52,7 +52,7 @@ seed_vm_root_image: >-
   {%- if os_distribution == 'ubuntu' %}
   https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
   {%- elif os_distribution == 'rocky' %}
-  http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
+  https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2
   {%- else -%}
   https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2
   {%- endif %}
diff --git a/etc/kayobe/infra-vms.yml b/etc/kayobe/infra-vms.yml
index 3274ed80..43dc225a 100644
--- a/etc/kayobe/infra-vms.yml
+++ b/etc/kayobe/infra-vms.yml
@@ -32,7 +32,7 @@
 # Base image for the infra VM root volume. Default is
 # "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
 # when os_distribution is "ubuntu", or
-# http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
+# https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2
 # when os_distribution is "rocky",
 # or
 # "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
diff --git a/etc/kayobe/seed-vm.yml b/etc/kayobe/seed-vm.yml
index f8c2ab8a..9921334b 100644
--- a/etc/kayobe/seed-vm.yml
+++ b/etc/kayobe/seed-vm.yml
@@ -26,7 +26,7 @@
 # Base image for the seed VM root volume. Default is
 # "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
 # when os_distribution is "ubuntu",
-# http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
+# https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2
 # when os_distribution is "rocky",
 # or
 # "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
diff --git a/releasenotes/notes/rocky-linux-8.6-image-cb4cf2781f802fb1.yaml b/releasenotes/notes/rocky-linux-8.6-image-cb4cf2781f802fb1.yaml
new file mode 100644
index 00000000..9dce57e0
--- /dev/null
+++ b/releasenotes/notes/rocky-linux-8.6-image-cb4cf2781f802fb1.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Updates base Rocky Linux 8 cloud image to
+    Rocky-8-GenericCloud.latest.x86_64.qcow2
-- 
GitLab