Synchronise master with upstream

CONTRIBUTING.rst

@@ -31,10 +31,16 @@ Bugs should be filed in launchpad, not GitHub:
 Contributing Code
 -----------------
 
-Bifrost requires a valid OpenStack contributor agreement to be signed before
-code can be accepted.  Details can be found in the development workflow link
+In order to contribute to the bifrost project, you need to adhere
+to the `Developer Certificate of Origin`_. OpenStack utilizes the Developer
+Certificate of Origin (DCO) as a lightweight means to confirm that you are
+entitled to contribute the code you submit. This ensures that you are
+providing your contributions under the project's license and that you have
+the right to do so. Details can be found in the development workflow link
 above.
 
+.. _Developer Certificate of Origin: https://developercertificate.org/
+
 Code isn't committed directly (so pull requests won't work); instead, the
 code is submitted for review through Gerrit via git review, and once its
 been sufficiently reviewed it will be merged from there.
@@ -45,7 +51,7 @@ Once that's done, the development workflow is, roughly::
    $ cd bifrost
    $ git checkout -b some-branch-name
    ... hack hack hack ...
-   $ git commit
+   $ git commit -s
    $ git review
    ... The configuration details for this are in .gitreview.
    ... When the command runs, it will add a ChangeId to your commit

playbooks/roles/bifrost-ironic-install/README.md

@@ -126,7 +126,7 @@ In case your HW needs a kernel option to boot, set the following variable:
 extra_kernel_options: Default undefined.
 
 Hardware types can be enabled using the "enabled_hardware_types" variable,
-which defaults to "ipmi, ilo".
+which defaults to "ipmi, redfish, manual-management".
 
 Enabled interfaces can be set via the "enabled_bios_interfaces",
 "enabled_boot_interfaces", "enabled_deploy_interfaces",

playbooks/roles/bifrost-ironic-install/defaults/main.yml

@@ -74,7 +74,7 @@ ipa_download_headers: {}
 ipa_kernel: "{{ http_boot_folder }}/ipa.kernel"
 ipa_ramdisk: "{{ http_boot_folder }}/ipa.initramfs"
 ipa_kernel_url: "{{ ipa_file_protocol }}://{{ internal_ip }}:{{ file_url_port }}/ipa.kernel"
-ipa_download_distro: centos9
+ipa_download_distro: debian
 ipa_kernel_upstream_url: "{{ tarballs_base_url }}/dib/files/ipa-{{ ipa_download_distro }}-{{ ipa_upstream_release }}.kernel"
 ipa_kernel_upstream_checksum_algo: "sha256"
 ipa_kernel_upstream_checksum_url: "{{ ipa_kernel_upstream_url }}.{{ ipa_kernel_upstream_checksum_algo }}"
@@ -208,7 +208,7 @@ ipa_git_folder: /opt/stack/ironic-python-agent
 ipa_builder_git_folder: /opt/stack/ironic-python-agent-builder
 prometheus_exporter_git_folder: /opt/stack/ironic-prometheus-exporter
 
-enabled_hardware_types: "ipmi,redfish,manual-management,ilo"
+enabled_hardware_types: "ipmi,redfish,manual-management"
 default_deploy_interface: "direct"
 enabled_deploy_interfaces: "direct,ramdisk"
 # These are calculated based on enabled_hardware_types if empty
@@ -433,4 +433,3 @@ pxe_kernel_params: >-
   {% endif %}
   {{ extra_kernel_options | default('') }}
 redfish_kernel_params: "{{ pxe_kernel_params }}"
-ilo_kernel_params: "{{ pxe_kernel_params }}"

playbooks/roles/bifrost-ironic-install/tasks/hw_types.yml

@@ -23,7 +23,6 @@
     enabled_bios_interfaces: >- # noqa jinja var-spacing
       no-bios
       {%- if "idrac" in enabled_hardware_types -%},idrac-redfish{%- endif -%}
-      {%- if "ilo" in enabled_hardware_types -%},ilo{%- endif -%}
       {%- if "redfish" in enabled_hardware_types -%},redfish{%- endif -%}
   when: not enabled_bios_interfaces
 
@@ -32,7 +31,6 @@
     enabled_boot_interfaces: >- # noqa jinja var-spacing
       ipxe,pxe
       {%- if "idrac" in enabled_hardware_types -%},idrac-redfish-virtual-media{%- endif -%}
-      {%- if "ilo" in enabled_hardware_types -%},ilo-virtual-media{%- endif -%}
       {%- if "redfish" in enabled_hardware_types -%},redfish-virtual-media{%- endif -%}
       {%- if "fake-hardware" in enabled_hardware_types -%},fake{%- endif -%}
   when: not enabled_boot_interfaces
@@ -49,8 +47,6 @@
     enabled_management_interfaces: >- # noqa jinja var-spacing
       noop
       {%- if "idrac" in enabled_hardware_types -%},idrac-redfish{%- endif -%}
-      {%- if "ilo" in enabled_hardware_types -%},ilo{%- endif -%}
-      {%- if "ilo5" in enabled_hardware_types -%},ilo5{%- endif -%}
       {%- if "ipmi" in enabled_hardware_types -%},ipmitool{%- endif -%}
       {%- if "redfish" in enabled_hardware_types -%},redfish{%- endif -%}
       {%- if "fake-hardware" in enabled_hardware_types -%},fake{%- endif -%}
@@ -61,7 +57,6 @@
     enabled_power_interfaces: >- # noqa jinja var-spacing
       fake
       {%- if "idrac" in enabled_hardware_types -%},idrac-redfish{%- endif -%}
-      {%- if "ilo" in enabled_hardware_types -%},ilo{%- endif -%}
       {%- if "ipmi" in enabled_hardware_types -%},ipmitool{%- endif -%}
       {%- if "redfish" in enabled_hardware_types -%},redfish{%- endif -%}
       {%- if enable_credential_less_deploy | bool -%},agent{%- endif -%}
@@ -73,7 +68,6 @@
     enabled_raid_interfaces: >- # noqa jinja var-spacing
       no-raid,agent
       {%- if "idrac" in enabled_hardware_types -%},idrac-redfish{%- endif -%}
-      {%- if "ilo5" in enabled_hardware_types -%},ilo5{%- endif -%}
       {%- if "redfish" in enabled_hardware_types -%},redfish{%- endif -%}
   when: not enabled_raid_interfaces
 
@@ -82,7 +76,6 @@
     enabled_vendor_interfaces: >- # noqa jinja var-spacing
       no-vendor
       {%- if "idrac" in enabled_hardware_types -%},idrac-redfish{%- endif -%}
-      {%- if "ilo" in enabled_hardware_types -%},ilo{%- endif -%}
       {%- if "ipmi" in enabled_hardware_types -%},ipmitool{%- endif -%}
       {%- if "redfish" in enabled_hardware_types -%},redfish{%- endif -%}
   when: not enabled_vendor_interfaces

playbooks/roles/bifrost-ironic-install/tasks/setup_firewalld.yml

@@ -16,6 +16,7 @@
     name: firewalld
     state: started
     enabled: yes
+    masked: false
 
 - name: "Disable iptables (if enabled)"
   service:

playbooks/roles/bifrost-ironic-install/tasks/vendor_deps.yml

@@ -11,13 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
-- name: "proliantutils - Install"
-  include_role:
-    name: bifrost-pip-install
-  vars:
-    package: proliantutils
-  when: "'ilo' in enabled_hardware_types"
-
 - name: "dracclient, sushy-oem-idrac - Install"
   include_role:
     name: bifrost-pip-install

playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2

@@ -138,10 +138,6 @@ allow_credentials = {{ enable_cors_credential_support | default('true') }}
 [ipmi]
 debug = {{ ironic_debug | bool and testing | bool }}
 
-[ilo]
-use_web_server_for_images = true
-kernel_append_params = {{ ilo_kernel_params }}
-
 [redfish]
 use_swift = False
 kernel_append_params = {{ redfish_kernel_params }}

playbooks/roles/bifrost-ironic-install/templates/nginx_conf.d_bifrost-httpboot.conf.j2

@@ -8,7 +8,7 @@ server {
         }
         {% if vmedia_enable_tls | bool %}
         # Served only through TLS
-        location ~ ^/(redfish|ilo)/ {
+        location ~ ^/redfish/ {
                 deny all;
                 return 404;
         }

releasenotes/notes/debian-default-2bb1d335f3ea515b.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The default IPA ramdisk used in bifrost is now debian DIB based
+    which is smaller and compatible with more versions of GRUB.

releasenotes/notes/retire-ilo-driver-da4317f3b1806ccd.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    The ILO driver has been removed as of the 2026.1 release.
+    The 'ilo' and 'ilo5' hardware types have been removed from the default
+    'enabled_hardware_types' list and all related configuration options,
+    dependencies, and interface support have been removed.

zuul.d/bifrost-jobs.yaml

@@ -210,8 +210,6 @@
       enable_tls: true
       test_driver: redfish
       use_vmedia: true
-      # Use Debian-based IPA which is smaller and compatible with GRUB 2.06
-      ipa_download_distro: "debian"
 
 - job:
     name: bifrost-tox-linters

zuul.d/project.yaml

@@ -19,9 +19,17 @@
         - bifrost-integration-redfish-vmedia-uefi-centos-10
         - bifrost-integration-redfish-vmedia-uefi-ubuntu-noble
         - bifrost-integration-redfish-vmedia-uefi-ubuntu-jammy
-        - bifrost-integration-redfish-vmedia-uefi-debian-bookworm
+        - bifrost-integration-redfish-vmedia-uefi-debian-bookworm:
+            # NOTE(TheJulia): This should be fixed with change
+            # https://review.opendev.org/c/openstack/bifrost/+/969886
+            # but we're presently broken on multiple aspects so this
+            # should be made voting again later.
+            voting: false
         - bifrost-upgrade-ubuntu-jammy
-        - bifrost-upgrade-keystone-centos-10
+        - bifrost-upgrade-keystone-centos-10:
+            # NOTE(TheJulia): This needs to be made voting again once
+            # the fix has been merged for Centos10.
+            voting: false
         - bifrost-upgrade-keystone-ubuntu-noble
         # Non-voting jobs
         - bifrost-slurp-upgrade-ubuntu-jammy:
@@ -73,9 +81,13 @@
         - bifrost-integration-redfish-vmedia-uefi-centos-10
         - bifrost-integration-redfish-vmedia-uefi-ubuntu-noble
         - bifrost-integration-redfish-vmedia-uefi-ubuntu-jammy
-        - bifrost-integration-redfish-vmedia-uefi-debian-bookworm
+        # NOTE(TheJulia): This should be fixed with change
+        # https://review.opendev.org/c/openstack/bifrost/+/969886
+        # but we're presently broken on multiple aspects so this
+        # should be made voting again later.
+        #- bifrost-integration-redfish-vmedia-uefi-debian-bookworm
         - bifrost-upgrade-ubuntu-jammy
-        - bifrost-upgrade-keystone-centos-10
+        # - bifrost-upgrade-keystone-centos-10
         - bifrost-upgrade-keystone-ubuntu-noble
     experimental:
       jobs: