Merge "Update to latest Rocky Linux cloud image" into stable/xena

stackhpc · Aug 8, 2022 · 85efbbe · 85efbbe
2 parents ac89fd0 + 7c46f57
commit 85efbbe
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git 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-20210210.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-20210210.0.x86_64.qcow2
   {%- endif %}

diff --git 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-20210210.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-20210210.0.x86_64.qcow2
   {%- endif %}

diff --git 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-20210210.0.x86_64.qcow2"

diff --git 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-20210210.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
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Updates base Rocky Linux 8 cloud image to
+    Rocky-8-GenericCloud.latest.x86_64.qcow2