ci: fix CI (aki/ari && novncproxy containers)

This is change which I don't like:
Reverts: Replace reference to ari/aki

And also merges in Steve's change in change-id
I2c087d0053f9ee36e688dcbfda925b25b557dde8 which is intended
to also disable ironic novncproxy process which should get CI
into a happy working place.

Assisted-By: Claude Opus 4.6
Change-Id: If576b0ce884fd2f21a183230af7e0b7cd1c46387
Signed-off-by: Julia Kreger <juliaashleykreger@gmail.com>

devstack/lib/ironic

@@ -4001,8 +4001,8 @@ function upload_baremetal_ironic_deploy {
             IRONIC_DEPLOY_KERNEL_ID=$(openstack --os-cloud devstack-admin \
                 image create \
                 $ironic_deploy_kernel_name \
-                --public --disk-format=raw \
-                --container-format=bare \
+                --public --disk-format=aki \
+                --container-format=aki \
                 --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"
@@ -4010,8 +4010,8 @@ function upload_baremetal_ironic_deploy {
             IRONIC_DEPLOY_RAMDISK_ID=$(openstack --os-cloud devstack-admin \
                 image create \
                 $ironic_deploy_ramdisk_name \
-                --public --disk-format=raw \
-                --container-format=bare \
+                --public --disk-format=ari \
+                --container-format=ari \
                 --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"

devstack/settings

@@ -1,4 +1,10 @@
-enable_service ironic ir-api ir-cond ir-novnc ir-sw-sim
+enable_service ironic ir-api ir-cond ir-sw-sim
+
+# TODO(stevebaker): re-enable ir-novnc to enable graphical console testing
+# This can be re-enabled when PPA repos are stable, or when the base
+# container image does not require package installs.
+# enable_service ir-novnc
+# NOTE(TheJulia): In other words, re-add ir-novnc to the list above.
 
 source $DEST/ironic/devstack/common_settings
 

doc/source/admin/anaconda-deploy-interface.rst

@@ -140,15 +140,15 @@ and the OS tarball and setting properties to refer to components can be seen bel
 .. code-block:: shell
 
         # vmlinuz
-        openstack image create --container-format bare --disk-format raw --shared \
+        openstack image create --container-format aki --disk-format aki --shared \
             --file ./vmlinuz anaconda-kernel-<version>
 
         # initrd/initramfs/ramdisk
-        openstack image create --container-format bare --disk-format raw --shared \
+        openstack image create --container-format ari --disk-format ari --shared \
             --file ./initrd.img anaconda-ramdisk-<version>
 
         # squashfs/stage2
-        openstack image create --container-format bare --disk-format raw --shared \
+        openstack image create --container-format ari --disk-format ari --shared \
             --file ./squashfs.img anaconda-stage2-<version>
 
         KERNEL_ID=$(openstack image show -f value -c id anaconda-kernel-<version>)

doc/source/install/configure-glance-images.rst

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

releasenotes/notes/update-kernel-ramdisk-artifacts-delineation-15a7d652d34b196f.yaml

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