Finishing touches

stackhpc · Dec 9, 2024 · 76b22bf · 76b22bf
1 parent 53dc815
commit 76b22bf
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/etc/kayobe/bifrost.yml b/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:
+kolla_bifrost_ipa_kernel_upstream_url: "{% if stackhpc_ipa_image_bifrost_enabled | bool %}{{ stackhpc_ipa_image_url }}/ipa.kernel{% endif %}"
 
 # URL of checksum of Ironic Python Agent (IPA) kernel image.
 #kolla_bifrost_ipa_kernel_checksum_url:
@@ -144,7 +144,7 @@
 #kolla_bifrost_ipa_kernel_checksum_algorithm:
 
 # URL of Ironic Python Agent (IPA) ramdisk image.
-#kolla_bifrost_ipa_ramdisk_upstream_url:
+kolla_bifrost_ipa_ramdisk_upstream_url: "{% if stackhpc_ipa_image_bifrost_enabled | bool %}{{ stackhpc_ipa_image_url }}/ipa.initramfs{% endif %}"
 
 # URL of checksum of Ironic Python Agent (IPA) ramdisk image.
 #kolla_bifrost_ipa_ramdisk_checksum_url:

diff --git a/etc/kayobe/ipa.yml b/etc/kayobe/ipa.yml
@@ -87,7 +87,7 @@ ipa_build_dib_elements_extra:
 #ipa_images_kernel_name:
 
 # URL of Ironic deployment kernel image to download.
-#ipa_kernel_upstream_url:
+ipa_kernel_upstream_url: "{% if stackhpc_ipa_image_overcloud_enabled | bool %}{{ stackhpc_ipa_image_url }}/ipa.kernel{% endif %}"
 
 # URL of checksum of Ironic deployment kernel image.
 #ipa_kernel_checksum_url:
@@ -99,7 +99,7 @@ ipa_build_dib_elements_extra:
 #ipa_images_ramdisk_name:
 
 # URL of Ironic deployment ramdisk image to download.
-#ipa_ramdisk_upstream_url:
+ipa_ramdisk_upstream_url: "{% if stackhpc_ipa_image_overcloud_enabled | bool %}{{ stackhpc_ipa_image_url }}/ipa.initramfs{% endif %}"
 
 # URL of checksum of Ironic deployment ramdisk image.
 #ipa_ramdisk_checksum_url:

diff --git a/etc/kayobe/kolla/config/bifrost/bifrost.yml b/etc/kayobe/kolla/config/bifrost/bifrost.yml
@@ -6,8 +6,5 @@ use_cirros: true
 cirros_deploy_image_upstream_url: "{{ stackhpc_overcloud_host_image_url }}"
 {% endif %}
 
-ipa_kernel_url: "{{ stackhpc_ipa_images_url }}/ipa.kernel"
-ipa_ramdisk_url: "{{ stackhpc_ipa_images_url }}/ipa.initramfs"
-
 # Disable debug logging to avoid generating large log files
 ironic_debug: false
diff --git a/etc/kayobe/kolla/config/ironic.conf b/etc/kayobe/kolla/config/ironic.conf
diff --git a/etc/kayobe/pulp-ipa-image-versions.yml b/etc/kayobe/pulp-ipa-image-versions.yml
@@ -1,4 +1,4 @@
 ---
 # IPA image versioning tags
-stackhpc_rocky_9_ipa_image_version: "2024.1-20241204T131128"
-stackhpc_ubuntu_jammy_ipa_image_version: "2024.1-20241204T131128"
+stackhpc_rocky_9_ipa_image_version: "2024.1-20241206T160829"
+stackhpc_ubuntu_jammy_ipa_image_version: "2024.1-20241206T160829"
diff --git a/etc/kayobe/stackhpc-ipa-images.yml b/etc/kayobe/stackhpc-ipa-images.yml
@@ -2,10 +2,16 @@
 #################################
 # Release train IPA image sources
 
+# Whether to use Release Train IPA images for Bifrost
+stackhpc_ipa_image_bifrost_enabled: true
+
+# Whether to use Release Train IPA images for Overcloud Ironic
+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_with_auth }}/\
-                         ipa/{{ openstack_release }}/{{ os_distribution }}/\
+stackhpc_ipa_image_url: "{{ stackhpc_release_pulp_content_url }}/ipa/\
+                         {{ openstack_release }}/{{ os_distribution }}/\
                          {{ os_release }}/{{ stackhpc_ipa_image_version }}"
 
 # IPA image version tag selection