Skip to content

Commit 75d93c8

Browse files
jovialmnasiadka
authored andcommitted
Support built-in inspector
Switches to using the builtin inspector rather than the standalone ironic-inspector service since this has now been dropped from kolla-ansible. Where possible, the new service has been configured to maintain the same behaviour of the old standalone service. When using the standalone inspector, Kayobe has a few opinionated defaults for the set of processing hooks. These defaults have been translated over to the built-in inspector equivalents for a more consistent experience. Inspection rules have rewritten to use the new format. CLI invocations have been updated to use the commands for the new inspection service. Change-Id: I09bd59d085c7ec3fa0ccd6abb84bd2d0c8b9825d Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/961266 Signed-off-by: Will Szumski <will@stackhpc.com>
1 parent 40d366e commit 75d93c8

File tree

26 files changed

+377
-221
lines changed

26 files changed

+377
-221
lines changed

ansible/baremetal-compute-introspection-data-save.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
virtualenv: "{{ venv }}"
1111
name:
1212
- python-openstackclient
13-
- python-ironic-inspector-client
13+
- python-ironicclient
1414
state: latest
1515
virtualenv_command: python3.{{ ansible_facts.python.version.minor }} -m venv
1616
extra_args: "{% if pip_upper_constraints_file %}-c {{ pip_upper_constraints_file }}{% endif %}"
@@ -31,7 +31,7 @@
3131
tasks:
3232
- name: Query baremetal compute nodes' hardware introspection data
3333
command: >
34-
{{ venv }}/bin/openstack baremetal introspection data save {{ inventory_hostname }}
34+
{{ venv }}/bin/openstack baremetal node inventory save {{ inventory_hostname }}
3535
register: save_result
3636
changed_when: False
3737
# Ignore errors, log a message later.

ansible/inventory/group_vars/all/bifrost

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ kolla_bifrost_extra_kernel_options: []
8989
###############################################################################
9090
# Ironic Inspector configuration.
9191

92-
# List of of inspector processing plugins.
93-
kolla_bifrost_inspector_processing_hooks: "{{ inspector_processing_hooks }}"
92+
# List of of inspector plugins.
93+
kolla_bifrost_inspector_hooks: "{{ inspector_hooks }}"
9494

9595
# Which MAC addresses to add as ports during introspection. One of 'all',
9696
# 'active' or 'pxe'.

0 commit comments

Comments
 (0)