Merge "Support built-in inspector"

Author: Zuul

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

@@ -10,7 +10,7 @@
         virtualenv: "{{ venv }}"
         name:
           - python-openstackclient
-          - python-ironic-inspector-client
+          - python-ironicclient
         state: latest
         virtualenv_command: python3.{{ ansible_facts.python.version.minor }} -m venv
         extra_args: "{% if pip_upper_constraints_file %}-c {{ pip_upper_constraints_file }}{% endif %}"
@@ -31,7 +31,7 @@
   tasks:
     - name: Query baremetal compute nodes' hardware introspection data
       command: >
-        {{ venv }}/bin/openstack baremetal introspection data save {{ inventory_hostname }}
+        {{ venv }}/bin/openstack baremetal node inventory save {{ inventory_hostname }}
       register: save_result
       changed_when: False
       # Ignore errors, log a message later.

ansible/inventory/group_vars/all/bifrost

@@ -89,8 +89,8 @@ kolla_bifrost_extra_kernel_options: []
 ###############################################################################
 # Ironic Inspector configuration.
 
-# List of of inspector processing plugins.
-kolla_bifrost_inspector_processing_hooks: "{{ inspector_processing_hooks }}"
+# List of of inspector plugins.
+kolla_bifrost_inspector_hooks: "{{ inspector_hooks }}"
 
 # Which MAC addresses to add as ports during introspection. One of 'all',
 # 'active' or 'pxe'.