openstack/kolla-ansible
Code Issues Proposed changes

ironic: Make ironic-inspector optional

Browse Source 
It has been deprecated in 2024.2 cycle - see [1].

[1]: https://review.opendev.org/c/openstack/ironic-inspector/+/923170

Change-Id: I8b8dbb84d25078c533d9eaf80103609bc6fd5d48
This commit is contained in:
Michal Nasiadka 2024-07-11 12:46:43 +02:00
parent 56454a0a64
commit e877ec3d2d
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/group_vars/all.yml
View File

@ -901,6 +901,7 @@ enable_horizon_zun: "{{ enable_zun | bool }}"
enable_influxdb: "{{ enable_cloudkitty | bool and cloudkitty_storage_backend == 'influxdb' }}" enable_influxdb: "{{ enable_cloudkitty | bool and cloudkitty_storage_backend == 'influxdb' }}"
enable_ironic: "no" enable_ironic: "no"
enable_ironic_dnsmasq: "{{ enable_ironic | bool }}" enable_ironic_dnsmasq: "{{ enable_ironic | bool }}"
enable_ironic_inspector: "no"
enable_ironic_neutron_agent: "{{ enable_neutron | bool and enable_ironic | bool }}" enable_ironic_neutron_agent: "{{ enable_neutron | bool and enable_ironic | bool }}"
enable_ironic_prometheus_exporter: "{{ enable_ironic | bool and enable_prometheus | bool }}" enable_ironic_prometheus_exporter: "{{ enable_ironic | bool and enable_prometheus | bool }}"
enable_iscsid: "{{ enable_cinder | bool and enable_cinder_backend_iscsi | bool }}" enable_iscsid: "{{ enable_cinder | bool and enable_cinder_backend_iscsi | bool }}"

2
ansible/roles/ironic/defaults/main.yml
View File

@ -36,7 +36,7 @@ ironic_services:
ironic-inspector: ironic-inspector:
container_name: ironic_inspector container_name: ironic_inspector
group: ironic-inspector group: ironic-inspector
enabled: true enabled: "{{ enable_ironic_inspector }}"
image: "{{ ironic_inspector_image_full }}" image: "{{ ironic_inspector_image_full }}"
privileged: True privileged: True
volumes: "{{ ironic_inspector_default_volumes + ironic_inspector_extra_volumes }}" volumes: "{{ ironic_inspector_default_volumes + ironic_inspector_extra_volumes }}"

4
ansible/roles/ironic/tasks/bootstrap_service.yml
View File

@ -43,7 +43,9 @@
volumes: "{{ ironic_inspector.volumes | reject('equalto', '') | list }}" volumes: "{{ ironic_inspector.volumes | reject('equalto', '') | list }}"
run_once: True run_once: True
delegate_to: "{{ groups[ironic_inspector.group][0] }}" delegate_to: "{{ groups[ironic_inspector.group][0] }}"
when: inventory_hostname in groups[ironic_inspector.group] when:
- inventory_hostname in groups[ironic_inspector.group]
- enable_ironic_inspector | bool
- name: Running ironic-tftp bootstrap container - name: Running ironic-tftp bootstrap container
vars: vars:

10
releasenotes/notes/deprecate-inspector-86fb3aa691099267.yaml Normal file
View File

@ -0,0 +1,10 @@
---
upgrade:
- |
``enable_ironic_inspector`` is set to ``no`` by default, due to Ironic
Inspector project deprecation (and plans for removal).
deprecations:
- |
``ironic-inspector`` deployment is deprecated for removal once
implementation in Ironic reaches feature parity. See
`Ironic Inspector deprecation notice <https://docs.openstack.org/releasenotes/ironic-inspector/2024.2.html#deprecation-notes>`_

2
tests/test-ironic.sh
View File

@ -21,8 +21,6 @@ function test_ironic_logged {
openstack --os-cloud kolla-admin-system-internal baremetal driver list openstack --os-cloud kolla-admin-system-internal baremetal driver list
openstack baremetal node list openstack baremetal node list
openstack baremetal port list openstack baremetal port list
# Ironic Inspector API
openstack baremetal introspection rule list
openstack baremetal node show tk0 openstack baremetal node show tk0
openstack baremetal node power off tk0 openstack baremetal node power off tk0