openstack/openstack-ansible-os_ironic
Code Issues Proposed changes

Change references to aki/ari to raw format

Browse Source 
As noted in https://bugs.launchpad.net/ironic/+bug/2074090
the kernel and ramdisk images now need to be uploaded in raw
format due to fixes for underlying CVEs.

Change-Id: I2b74d9ab4d07a4d5b6045d353cf91db70c4e6cb1
This commit is contained in:
Andrew Bonney 2024-10-22 14:23:28 +01:00
parent b3bbef88b3
commit efbcae40b1
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
defaults/main.yml
View File

@ -463,13 +463,13 @@ ironic_deploy_image_initramfs_name: "{{ ironic_deploy_image_base_name + '.initra
ironic_deploy_image_list: ironic_deploy_image_list:
- url: "{{ ironic_deploy_image_server ~ ironic_deploy_image_server_path ~ ironic_deploy_image_kernel_name }}" - url: "{{ ironic_deploy_image_server ~ ironic_deploy_image_server_path ~ ironic_deploy_image_kernel_name }}"
sha_url: "{{ ironic_deploy_image_server ~ ironic_deploy_image_server_path ~ ironic_deploy_image_kernel_name ~ '.sha256' }}" sha_url: "{{ ironic_deploy_image_server ~ ironic_deploy_image_server_path ~ ironic_deploy_image_kernel_name ~ '.sha256' }}"
container_format: 'aki' container_format: 'bare'
disk_format: 'aki' disk_format: 'raw'
name: "{{ ironic_deploy_image_kernel_name }}" name: "{{ ironic_deploy_image_kernel_name }}"
- url: "{{ ironic_deploy_image_server ~ ironic_deploy_image_server_path ~ ironic_deploy_image_initramfs_name }}" - url: "{{ ironic_deploy_image_server ~ ironic_deploy_image_server_path ~ ironic_deploy_image_initramfs_name }}"
sha_url: "{{ ironic_deploy_image_server ~ ironic_deploy_image_server_path ~ ironic_deploy_image_initramfs_name ~ '.sha256' }}" sha_url: "{{ ironic_deploy_image_server ~ ironic_deploy_image_server_path ~ ironic_deploy_image_initramfs_name ~ '.sha256' }}"
container_format: 'ari' container_format: 'bare'
disk_format: 'ari' disk_format: 'raw'
name: "{{ ironic_deploy_image_initramfs_name }}" name: "{{ ironic_deploy_image_initramfs_name }}"
# allow user defined extra images to upload # allow user defined extra images to upload

16
doc/source/configure-ironic.rst
View File

@ -233,15 +233,15 @@ creating partition-based images.
# Kernel image: # Kernel image:
openstack image create my-image.kernel \ openstack image create my-image.kernel \
--public \ --public \
--disk-format aki \ --disk-format raw \
--container-format aki \ --container-format bare \
--file my-image.vmlinuz --file my-image.vmlinuz
# Ramdisk image # Ramdisk image
openstack image create my-image.initrd \ openstack image create my-image.initrd \
--public \ --public \
--disk-format ari \ --disk-format raw \
--container-format ari \ --container-format bare \
--file my-image.initrd --file my-image.initrd
# User image # User image
@ -413,8 +413,8 @@ following characteristics:
node_name=baremetal01 node_name=baremetal01
node_mac="f0:92:1c:0c:1f:88" # MAC address of PXE interface (em1 as example) node_mac="f0:92:1c:0c:1f:88" # MAC address of PXE interface (em1 as example)
deploy_aki=ironic-deploy-aki # Kernel image deploy_kernel=ironic-deploy-kernel # Kernel image
deploy_ari=ironic-deploy-ari # Ramdisk image deploy_ramdisk=ironic-deploy-ramdisk # Ramdisk image
resource=ironic-gold # Ironic resource class (matches flavor as CUSTOM_IRONIC_GOLD) resource=ironic-gold # Ironic resource class (matches flavor as CUSTOM_IRONIC_GOLD)
phys_arch=x86_64 phys_arch=x86_64
phys_cpus=32 phys_cpus=32
@ -439,8 +439,8 @@ following characteristics:
--driver-info ipmi_username=$ipmi_username \ --driver-info ipmi_username=$ipmi_username \
--driver-info ipmi_password=$ipmi_password \ --driver-info ipmi_password=$ipmi_password \
--driver-info ipmi_address=$ipmi_address \ --driver-info ipmi_address=$ipmi_address \
--driver-info deploy_kernel=`openstack image show $deploy_aki -c id |awk '/id / {print $4}'` \ --driver-info deploy_kernel=`openstack image show $deploy_kernel -c id |awk '/id / {print $4}'` \
--driver-info deploy_ramdisk=`openstack image show $deploy_ari -c id |awk '/id / {print $4}'` \ --driver-info deploy_ramdisk=`openstack image show $deploy_ramdisk -c id |awk '/id / {print $4}'` \
--property cpus=$phys_cpus \ --property cpus=$phys_cpus \
--property memory_mb=$phys_ram \ --property memory_mb=$phys_ram \
--property local_gb=$phys_disk \ --property local_gb=$phys_disk \

7
releasenotes/notes/kernel-ramdisk-image-format-3edd5c7479ebd32a.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
The format of kernel and ramdisk images for Ironic is now raw in order to
conform to upstream expectations.
See https://bugs.launchpad.net/ironic/+bug/2074090