From d12fc12a882e7c8fda4dce7d34c056b91c9b0449 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 28 Nov 2025 01:26:24 +0900 Subject: [PATCH] Drop remaining references to ironic-inspector Remove a few remaining references to ironic-inspector, which were not covered by 32dd5ec5964f79f1d51929f77e2f6f6081bcfdea which removed integration with ironic-inspector. Change-Id: Ib391c0f697c7f90f99660cf333deb0cd25a3bc05 Signed-off-by: Takashi Kajinami --- api-ref/source/parameters.yaml | 4 ++-- doc/source/install/enabling-drivers.rst | 2 +- ironic/common/json_rpc/client.py | 1 - ironic/common/keystone.py | 3 +-- ironic/conf/inspector.py | 5 ++--- ironic/drivers/modules/inspector/interface.py | 4 ++-- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/api-ref/source/parameters.yaml b/api-ref/source/parameters.yaml index 76f72c5441..a3d3b832e3 100644 --- a/api-ref/source/parameters.yaml +++ b/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 - inspection. May be edited via the REST API at any time. + Physical characteristics of this Node. Populated during inspection. May be + edited via the REST API at any time. in: body required: true type: JSON diff --git a/doc/source/install/enabling-drivers.rst b/doc/source/install/enabling-drivers.rst index d3bf687996..95775d489e 100644 --- a/doc/source/install/enabling-drivers.rst +++ b/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 diff --git a/ironic/common/json_rpc/client.py b/ironic/common/json_rpc/client.py index bf3dc4331d..771f692b27 100644 --- a/ironic/common/json_rpc/client.py +++ b/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, diff --git a/ironic/common/keystone.py b/ironic/common/keystone.py index 423cd81ed8..1c3ec05f7b 100644 --- a/ironic/common/keystone.py +++ b/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(key) + service_types = types.service_types_by_project.get(group) if service_types: conf.set_default('service_type', service_types[0], group=group) diff --git a/ironic/conf/inspector.py b/ironic/conf/inspector.py index a7909ad0c1..d59ddf7859 100644 --- a/ironic/conf/inspector.py +++ b/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 ' - 'ironic-inspector). Pairs key=value separated by ' - 'spaces.')), + 'ramdisk when boot is managed by ironic. Pairs ' + 'key=value separated by spaces.')), cfg.BoolOpt('power_off', default=True, help=_('whether to power off a node after inspection ' 'finishes. Ignored for nodes that have fast ' diff --git a/ironic/drivers/modules/inspector/interface.py b/ironic/drivers/modules/inspector/interface.py index 8a1ad479ae..590aab0429 100644 --- a/ironic/drivers/modules/inspector/interface.py +++ b/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: