From 59eb49f88efd6b83f7431363d31676188e49390a Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Tue, 9 Sep 2025 09:39:04 +0200 Subject: [PATCH] Remove ironic-inspector support The ironic-inspector service has been replaced by built-in in-band inspection in ironic [1]. This change disables and removes enough code to allow CI tests to pass. Migration to the built-in in-band inspection will be done separately. [1] https://docs.openstack.org/ironic/latest/admin/inspection/migration.html Change-Id: I8caa8ea763fe5aee9d356850378db770cdbf2ccd Signed-off-by: Pierre Riteau --- ansible/inventory/group_vars/all/kolla | 1 - ansible/overcloud-introspection-rules.yml | 24 ++----------------- .../templates/overcloud-services.j2 | 7 +----- .../roles/kolla-ansible/tests/test-extras.yml | 1 - ansible/roles/kolla-ansible/vars/main.yml | 1 - .../roles/kolla-openstack/defaults/main.yml | 7 ------ .../molecule/enable-everything/molecule.yml | 3 --- .../molecule/enable-everything/prepare.yml | 1 - .../enable-everything/tests/test_default.py | 2 -- ansible/seed-introspection-rules.yml | 2 +- .../configuration/reference/kolla-ansible.rst | 2 -- etc/kayobe/kolla.yml | 1 - playbooks/kayobe-overcloud-base/run.yml | 1 + .../kayobe-overcloud-upgrade-base/run.yml | 1 + ...rop-ironic-inspector-ce12abb330f5398b.yaml | 4 ++++ 15 files changed, 10 insertions(+), 48 deletions(-) create mode 100644 releasenotes/notes/drop-ironic-inspector-ce12abb330f5398b.yaml diff --git a/ansible/inventory/group_vars/all/kolla b/ansible/inventory/group_vars/all/kolla index 9b63291b7..f20c0e5fd 100644 --- a/ansible/inventory/group_vars/all/kolla +++ b/ansible/inventory/group_vars/all/kolla @@ -548,7 +548,6 @@ kolla_enable_heat: "{{ kolla_enable_openstack_core | bool }}" kolla_enable_horizon: "{{ kolla_enable_openstack_core | bool }}" kolla_enable_influxdb: "{{ kolla_enable_cloudkitty | bool }}" kolla_enable_ironic: "no" -kolla_enable_ironic_inspector: "{{ kolla_enable_ironic | bool }}" kolla_enable_ironic_neutron_agent: "{{ kolla_enable_neutron | bool and kolla_enable_ironic | bool }}" kolla_enable_iscsid: "{{ kolla_enable_cinder | bool and kolla_enable_cinder_backend_iscsi | bool }}" kolla_enable_kuryr: "no" diff --git a/ansible/overcloud-introspection-rules.yml b/ansible/overcloud-introspection-rules.yml index 6f460968f..0782800d2 100644 --- a/ansible/overcloud-introspection-rules.yml +++ b/ansible/overcloud-introspection-rules.yml @@ -5,9 +5,9 @@ tags: - introspection-rules tasks: - - name: Create controllers group with ironic inspector enabled + - name: Create controllers group with ironic enabled group_by: - key: "controllers_for_introspection_rules_{{ kolla_enable_ironic_inspector | bool }}" + key: "controllers_for_introspection_rules_{{ kolla_enable_ironic | bool }}" changed_when: false - name: Ensure introspection rules are registered in Ironic Inspector @@ -55,23 +55,3 @@ changed_when: False register: ipa_ramdisk_id environment: "{{ openstack_auth_env }}" - - roles: - - role: ironic-inspector-rules - os_openstacksdk_install_epel: "{{ dnf_install_epel }}" - os_openstacksdk_state: "latest" - ironic_inspector_venv: "{{ venv }}" - ironic_inspector_upper_constraints_file: "{{ openstacksdk_upper_constraints_file }}" - ironic_inspector_auth_type: "{{ openstack_auth_type }}" - ironic_inspector_auth: "{{ openstack_auth }}" - ironic_inspector_cacert: "{{ openstack_cacert }}" - ironic_inspector_interface: "{{ openstack_interface }}" - ironic_inspector_rules: "{{ inspector_rules }}" - # These variables may be referenced in the introspection rules. - inspector_rule_var_ipmi_username: "{{ inspector_ipmi_username }}" - inspector_rule_var_ipmi_password: "{{ inspector_ipmi_password }}" - inspector_rule_var_redfish_username: "{{ inspector_redfish_username }}" - inspector_rule_var_redfish_password: "{{ inspector_redfish_password }}" - inspector_rule_var_lldp_switch_port_interface: "{{ inspector_lldp_switch_port_interface_default }}" - inspector_rule_var_deploy_kernel: "{{ ipa_kernel_id.stdout }}" - inspector_rule_var_deploy_ramdisk: "{{ ipa_ramdisk_id.stdout }}" diff --git a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 b/ansible/roles/kolla-ansible/templates/overcloud-services.j2 index 7fedcb915..b87737dbb 100644 --- a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 +++ b/ansible/roles/kolla-ansible/templates/overcloud-services.j2 @@ -198,13 +198,8 @@ ironic [ironic-conductor:children] ironic -{% if kolla_ironic_inspector_host %} -[ironic-inspector] -{{ kolla_ironic_inspector_host }} -{% else %} -[ironic-inspector:children] +[ironic-dnsmasq:children] ironic -{% endif %} [ironic-tftp:children] ironic diff --git a/ansible/roles/kolla-ansible/tests/test-extras.yml b/ansible/roles/kolla-ansible/tests/test-extras.yml index bef29ad3b..607d7945e 100644 --- a/ansible/roles/kolla-ansible/tests/test-extras.yml +++ b/ansible/roles/kolla-ansible/tests/test-extras.yml @@ -165,7 +165,6 @@ kolla_enable_horizon: True kolla_enable_influxdb: True kolla_enable_ironic: True - kolla_enable_ironic_inspector: True kolla_enable_ironic_neutron_agent: True kolla_enable_kuryr: True kolla_enable_magnum: True diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml index 389a6be03..288fef215 100644 --- a/ansible/roles/kolla-ansible/vars/main.yml +++ b/ansible/roles/kolla-ansible/vars/main.yml @@ -142,7 +142,6 @@ kolla_feature_flags: - influxdb - ironic - ironic_dnsmasq - - ironic_inspector - ironic_neutron_agent - ironic_prometheus_exporter - iscsid diff --git a/ansible/roles/kolla-openstack/defaults/main.yml b/ansible/roles/kolla-openstack/defaults/main.yml index f74c995cd..0d9f2b697 100644 --- a/ansible/roles/kolla-openstack/defaults/main.yml +++ b/ansible/roles/kolla-openstack/defaults/main.yml @@ -92,10 +92,6 @@ kolla_openstack_custom_config_include_globs_default: glob: horizon/** - enabled: '{{ kolla_enable_influxdb | bool }}' glob: influx* - - enabled: '{{ kolla_enable_ironic_inspector | bool }}' - glob: ironic-inspector.conf - - enabled: '{{ kolla_enable_ironic_inspector | bool }}' - glob: ironic-inspector/** - enabled: '{{ kolla_enable_ironic | bool }}' glob: ironic.conf - enabled: '{{ kolla_enable_ironic | bool }}' @@ -564,9 +560,6 @@ kolla_extra_ironic: ############################################################################### # Ironic inspector configuration. -# Whether to enable Ironic inspector. -kolla_enable_ironic_inspector: "{{ kolla_enable_ironic | bool }}" - # Comma-separated list of inspector processing plugins. kolla_inspector_processing_hooks: diff --git a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml b/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml index 345cc4eef..9fcabb6b2 100644 --- a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml +++ b/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml @@ -80,9 +80,6 @@ provisioner: kolla_extra_ironic: | [extra-ironic.conf] foo=bar - kolla_extra_inspector: | - [extra-ironic-inspector.conf] - foo=bar kolla_inspector_ipa_kernel_path: ${MOLECULE_TEMP_PATH:-/tmp/molecule}/ironic-agent.kernel kolla_inspector_ipa_ramdisk_path: ${MOLECULE_TEMP_PATH:-/tmp/molecule}/ironic-agent.initramfs kolla_enable_keepalived: true diff --git a/ansible/roles/kolla-openstack/molecule/enable-everything/prepare.yml b/ansible/roles/kolla-openstack/molecule/enable-everything/prepare.yml index 3c491fa1e..a39c596c9 100644 --- a/ansible/roles/kolla-openstack/molecule/enable-everything/prepare.yml +++ b/ansible/roles/kolla-openstack/molecule/enable-everything/prepare.yml @@ -63,7 +63,6 @@ - grafana.ini - heat.conf - ironic.conf - - ironic-inspector.conf - keystone.conf - magnum.conf - manila.conf diff --git a/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py b/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py index 4e9a40a22..72d74d0b0 100644 --- a/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py +++ b/ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py @@ -37,7 +37,6 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( 'grafana.ini', 'heat.conf', 'ironic.conf', - 'ironic-inspector.conf', 'keystone.conf', 'magnum.conf', 'manila.conf', @@ -70,7 +69,6 @@ def test_service_ini_file(host, path): 'grafana.ini', 'heat.conf', 'ironic.conf', - 'ironic-inspector.conf', 'keystone.conf', 'magnum.conf', 'manila.conf', diff --git a/ansible/seed-introspection-rules.yml b/ansible/seed-introspection-rules.yml index edcb031bf..ca92bdd13 100644 --- a/ansible/seed-introspection-rules.yml +++ b/ansible/seed-introspection-rules.yml @@ -19,4 +19,4 @@ inspector_rule_var_lldp_switch_port_interface: "{{ kolla_bifrost_inspector_lldp_switch_port_interface }}" inspector_rule_var_deploy_kernel: "{{ kolla_bifrost_inspector_deploy_kernel }}" inspector_rule_var_deploy_ramdisk: "{{ kolla_bifrost_inspector_deploy_ramdisk }}" - when: kolla_enable_bifrost | bool + when: kolla_enable_bifrost | bool and false # TODO(priteau): Re-enable with built-in inspection diff --git a/doc/source/configuration/reference/kolla-ansible.rst b/doc/source/configuration/reference/kolla-ansible.rst index be35761a3..5fc6e7e45 100644 --- a/doc/source/configuration/reference/kolla-ansible.rst +++ b/doc/source/configuration/reference/kolla-ansible.rst @@ -721,8 +721,6 @@ which files are supported. ``heat/*`` Extended heat configuration. ``horizon/*`` Extended horizon configuration. ``influx*`` InfluxDB configuration. - ``ironic-inspector.conf`` Ironic inspector configuration. - ``ironic-inspector/*`` Extended Ironic inspector configuration ``ironic.conf`` Ironic configuration. ``ironic/*`` Extended ironic configuration. ``keepalived/*`` Extended keepalived configuration. diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 9859a9e6b..b0ddc74bd 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -350,7 +350,6 @@ #kolla_enable_influxdb: #kolla_enable_ironic: #kolla_enable_ironic_dnsmasq: -#kolla_enable_ironic_inspector: #kolla_enable_ironic_neutron_agent: #kolla_enable_ironic_prometheus_exporter: #kolla_enable_iscsid: diff --git a/playbooks/kayobe-overcloud-base/run.yml b/playbooks/kayobe-overcloud-base/run.yml index 76ecd8af6..cdc3828e2 100644 --- a/playbooks/kayobe-overcloud-base/run.yml +++ b/playbooks/kayobe-overcloud-base/run.yml @@ -41,6 +41,7 @@ cmd: dev/overcloud-test-baremetal.sh &> {{ logs_dir }}/ansible/overcloud-test-baremetal chdir: "{{ kayobe_src_dir }}" executable: /bin/bash + when: false # TODO(priteau): Re-enable with built-in inspection - name: Register dummy baremetal compute nodes shell: diff --git a/playbooks/kayobe-overcloud-upgrade-base/run.yml b/playbooks/kayobe-overcloud-upgrade-base/run.yml index 820536979..03d5e3e72 100644 --- a/playbooks/kayobe-overcloud-upgrade-base/run.yml +++ b/playbooks/kayobe-overcloud-upgrade-base/run.yml @@ -109,6 +109,7 @@ cmd: dev/overcloud-test-baremetal.sh &> {{ logs_dir }}/ansible/overcloud-test-bm-post-upgrade chdir: "{{ kayobe_src_dir }}" executable: /bin/bash + when: false # TODO(priteau): Re-enable with built-in inspection environment: KAYOBE_CONFIG_SOURCE_PATH: "{{ kayobe_config_src_dir }}" diff --git a/releasenotes/notes/drop-ironic-inspector-ce12abb330f5398b.yaml b/releasenotes/notes/drop-ironic-inspector-ce12abb330f5398b.yaml new file mode 100644 index 000000000..bea9b3d7f --- /dev/null +++ b/releasenotes/notes/drop-ironic-inspector-ce12abb330f5398b.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Support for deploying ironic-inspector has been dropped.