openstack/ironic
Code Issues Proposed changes

Replace reference to ari/aki

Browse Source 
Replace 'ari' and 'aki' with correct values for kernel/ramdisk
artifacts.

Closes-Bug: #2074090
Change-Id: I5b5bcf7e081fc0865ec43ccf6a988280ec7c9273
This commit is contained in:
cid 2024-08-26 19:58:11 +01:00
parent e6e075de1f
commit aaec00275a
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devstack/lib/ironic
View File

@ -3228,8 +3228,8 @@ function upload_baremetal_ironic_deploy {
IRONIC_DEPLOY_KERNEL_ID=$(openstack --os-cloud devstack-admin \
image create \
$ironic_deploy_kernel_name \
--public --disk-format=aki \
--container-format=aki \
--public --disk-format=raw \
--container-format=bare \
--file $(readlink -f $IRONIC_DEPLOY_KERNEL) | \
grep ' id ' | get_field 2)
die_if_not_set $LINENO IRONIC_DEPLOY_KERNEL_ID "Failed to load kernel image into glance"
@ -3237,8 +3237,8 @@ function upload_baremetal_ironic_deploy {
IRONIC_DEPLOY_RAMDISK_ID=$(openstack --os-cloud devstack-admin \
image create \
$ironic_deploy_ramdisk_name \
--public --disk-format=ari \
--container-format=ari \
--public --disk-format=raw \
--container-format=bare \
--file $(readlink -f $IRONIC_DEPLOY_RAMDISK) | \
grep ' id ' | get_field 2)
die_if_not_set $LINENO IRONIC_DEPLOY_RAMDISK_ID "Failed to load ramdisk image into glance"

12
doc/source/admin/anaconda-deploy-interface.rst
View File

@ -121,12 +121,12 @@ glance:
.. code-block:: shell
openstack image create --file ./vmlinuz --container-format aki \
--disk-format aki --shared anaconda-kernel-<version>
openstack image create --file ./initrd.img --container-format ari \
--disk-format ari --shared anaconda-ramdisk-<version>
openstack image create --file ./squashfs.img --container-format ari \
--disk-format ari --shared anaconda-stage-<version>
openstack image create --file ./vmlinuz --container-format bare \
--disk-format raw --shared anaconda-kernel-<version>
openstack image create --file ./initrd.img --container-format bare \
--disk-format raw --shared anaconda-ramdisk-<version>
openstack image create --file ./squashfs.img --container-format bare \
--disk-format raw --shared anaconda-stage-<version>
openstack image create --file ./os-image.tar.gz \
--container-format bare --disk-format raw --shared \
--property kernel_id=<glance_uuid_vmlinuz> \

8
doc/source/install/configure-glance-images.rst
View File

@ -39,14 +39,14 @@ the Image service for each one as it is generated.
.. code-block:: console
$ openstack image create my-kernel --public \
--disk-format aki --container-format aki --file my-image.vmlinuz
--disk-format raw --container-format bare --file my-image.vmlinuz
Store the image uuid obtained from the above step as ``MY_VMLINUZ_UUID``.
.. code-block:: console
$ openstack image create my-image.initrd --public \
--disk-format ari --container-format ari --file my-image.initrd
--disk-format raw --container-format bare --file my-image.initrd
Store the image UUID obtained from the above step as ``MY_INITRD_UUID``.
@ -80,7 +80,7 @@ Deploy ramdisk images
.. code-block:: console
$ openstack image create deploy-vmlinuz --public \
--disk-format aki --container-format aki \
--disk-format raw --container-format bare \
--file ironic-python-agent.vmlinuz
Store the image UUID obtained from the above step as ``DEPLOY_VMLINUZ_UUID``
@ -89,7 +89,7 @@ Deploy ramdisk images
.. code-block:: console
$ openstack image create deploy-initrd --public \
--disk-format ari --container-format ari \
--disk-format raw --container-format bare \
--file ironic-python-agent.initramfs
Store the image UUID obtained from the above step as ``DEPLOY_INITRD_UUID``

5
releasenotes/notes/update-kernel-ramdisk-artifacts-delineation-15a7d652d34b196f.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Replaces `ari/aki` format references with appropriate artifacts
for kernel and ramdisk in the documentation and Ironic DevStack plugin.