Merge "Drop remaining references to ironic-inspector"

api-ref/source/parameters.yaml

@@ -1439,8 +1439,8 @@ n_ports:
   type: array
 n_properties:
   description: |
-    Physical characteristics of this Node. Populated by ironic-inspector during
+    Physical characteristics of this Node. Populated during inspection. May be
-    inspection. May be edited via the REST API at any time.
+    edited via the REST API at any time.
   in: body
   required: true
   type: JSON

doc/source/install/enabling-drivers.rst

@@ -181,7 +181,7 @@ IPMI and Redfish, with a few additional features:
     enabled_boot_interfaces = pxe
     enabled_console_interfaces = ipmitool-socat,no-console
     enabled_deploy_interfaces = direct
-    enabled_inspect_interfaces = inspector
+    enabled_inspect_interfaces = agent
     enabled_management_interfaces = ipmitool,redfish
     enabled_network_interfaces = flat,neutron
     enabled_power_interfaces = ipmitool,redfish

ironic/common/json_rpc/client.py

@@ -77,7 +77,6 @@ class Client(object):
 
     allowed_exception_namespaces = [
         "ironic.common.exception.",
-        "ironic_inspector.utils.",
     ]
 
     def __init__(self, serializer, version_cap=None,

ironic/common/keystone.py

@@ -180,8 +180,7 @@ def register_auth_opts(conf, group, service_type=None):
         conf.set_default('service_type', service_type, group=group)
     else:
         types = os_service_types.get_service_types()
-        key = 'ironic-inspector' if group == 'inspector' else group
+        service_types = types.service_types_by_project.get(group)
-        service_types = types.service_types_by_project.get(key)
         if service_types:
             conf.set_default('service_type', service_types[0], group=group)
 

ironic/conf/inspector.py

@@ -53,9 +53,8 @@ opts = [
                        'ensures LLDP collection across all interfaces.')),
     cfg.StrOpt('extra_kernel_params', default='',
                help=_('extra kernel parameters to pass to the inspection '
-                      'ramdisk when boot is managed by ironic (not '
+                      'ramdisk when boot is managed by ironic. Pairs '
-                      'ironic-inspector). Pairs key=value separated by '
+                      'key=value separated by spaces.')),
-                      'spaces.')),
     cfg.BoolOpt('power_off', default=True,
                 help=_('whether to power off a node after inspection '
                        'finishes. Ignored for nodes that have fast '

ironic/drivers/modules/inspector/interface.py

@@ -180,9 +180,9 @@ class Common(base.InspectInterface):
         task.node.save()
 
         LOG.debug('Starting inspection for node %(uuid)s. Booting is '
-                  'managed by %(project)s',
+                  '%(managed)s by ironic',
                   {'uuid': task.node.uuid,
-                   'project': 'ironic' if manage_boot else 'ironic-inspector'})
+                   'managed': manage_boot})
 
         if manage_boot:
             try: