Apply suggestions from code review

Co-authored-by: Alex-Welsh <[email protected]>

Author: assumptionsandg

.github/workflows/ipa-image-build.yml

@@ -76,7 +76,7 @@ jobs:
           pip install -r ../src/kayobe-config/requirements.txt
 
       - name: Install terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
 
       - name: Initialise terraform
         run: terraform init
@@ -228,7 +228,7 @@ jobs:
           kayobe playbook run \
           src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
           -e artifact_path=/opt/kayobe/images/ipa \
-          -e artifact_type=ipa \
+          -e artifact_type=ipa-images \
           -e artifact_tag=${{ steps.ipa_image_tag.outputs.ipa_image_tag }} \
           -e os_distribution="ubuntu" \
           -e os_release="jammy" \

doc/source/configuration/ipa.rst

@@ -7,17 +7,18 @@ Ironic Python Agent (IPA)
 Release Train IPA
 =================
 
-StackHPC provides built Ironic Python Agent (IPA) images in Release Train
+StackHPC provides prebuilt Ironic Python Agent (IPA) images in Release Train
 through Ark.
 
-These images are built in a CI using a Kayobe workflow :kayobe-doc:
-`Kayobe documentation <configuration/reference/ironic-python-agent.html>`
-and are configured in this repository.
+These images are built in CI using a GitHub workflow and are configured in this
+repository. See  :kayobe-doc: `Kayobe documentation
+<configuration/reference/ironic-python-agent.html>` for more details on IPA.
 
-Release Train IPA is used by Bifrost and Overcloud Ironic by default in
-StackHPC Kayobe Configuration, and is pulled in to Inspector when running
-``kayobe seed service deploy`` for Bifrost or ``kayobe overcloud post configure``
-for Ironic. This behaviour can be disabled in `stackhpc-ipa-images.yml`:
+Release Train IPA images are used by Bifrost and Overcloud Ironic by default in
+the StackHPC Kayobe Configuration, and are pulled in to the Ironic Inspector
+when running ``kayobe seed service deploy`` for Bifrost or ``kayobe overcloud
+post configure`` for Overcloud Ironic. This behaviour can be disabled in
+`stackhpc-ipa-images.yml`:
 
 .. code-block:: yaml
 

etc/kayobe/bifrost.yml

@@ -135,7 +135,7 @@
 # Ironic Python Agent (IPA) configuration.
 
 # URL of Ironic Python Agent (IPA) kernel image.
-kolla_bifrost_ipa_kernel_upstream_url: "{% if stackhpc_ipa_image_bifrost_enabled | bool %}{{ stackhpc_ipa_image_url }}/ipa.kernel{% endif %}"
+kolla_bifrost_ipa_kernel_upstream_url: "{{ (stackhpc_ipa_image_url + '/ipa.kernel') if stackhpc_ipa_image_bifrost_enabled | bool }}"
 
 # URL of checksum of Ironic Python Agent (IPA) kernel image.
 #kolla_bifrost_ipa_kernel_checksum_url:
@@ -144,7 +144,7 @@ kolla_bifrost_ipa_kernel_upstream_url: "{% if stackhpc_ipa_image_bifrost_enabled
 #kolla_bifrost_ipa_kernel_checksum_algorithm:
 
 # URL of Ironic Python Agent (IPA) ramdisk image.
-kolla_bifrost_ipa_ramdisk_upstream_url: "{% if stackhpc_ipa_image_bifrost_enabled | bool %}{{ stackhpc_ipa_image_url }}/ipa.initramfs{% endif %}"
+kolla_bifrost_ipa_ramdisk_upstream_url: "{{ (stackhpc_ipa_image_url + '/ipa.initramfs') if stackhpc_ipa_image_bifrost_enabled | bool }}"
 
 # URL of checksum of Ironic Python Agent (IPA) ramdisk image.
 #kolla_bifrost_ipa_ramdisk_checksum_url:

etc/kayobe/stackhpc-ipa-images.yml

@@ -10,7 +10,7 @@ stackhpc_ipa_image_overcloud_enabled: true
 
 # The IPA image source, defined by os_distribution,
 # os_release, and the current stable version.
-stackhpc_ipa_image_url: "{{ stackhpc_release_pulp_content_url }}/ipa/\
+stackhpc_ipa_image_url: "{{ stackhpc_release_pulp_content_url }}/ipa-images/\
                          {{ openstack_release }}/{{ os_distribution }}/\
                          {{ os_release }}/{{ stackhpc_ipa_image_version }}"