diff --git a/ironic_inspector/conf/processing.py b/ironic_inspector/conf/processing.py index 502c284a9..678d9695d 100644 --- a/ironic_inspector/conf/processing.py +++ b/ironic_inspector/conf/processing.py @@ -80,7 +80,11 @@ _OPTS = [ 'not be stored.')), cfg.StrOpt('store_data_location', help=_('Name of the key to store the location of stored data ' - 'in the extra column of the Ironic database.')), + 'in the extra column of the Ironic database.'), + deprecated_for_removal=True, + deprecated_reason=_('The introspection data could be retrieved ' + 'from inspector API, there is no need to ' + 'keep an extra link in ironic.')), cfg.BoolOpt('disk_partitioning_spacing', default=True, help=_('Whether to leave 1 GiB of disk size untouched for ' diff --git a/ironic_inspector/plugins/introspection_data.py b/ironic_inspector/plugins/introspection_data.py index 6f51d6b7b..0519390a3 100644 --- a/ironic_inspector/plugins/introspection_data.py +++ b/ironic_inspector/plugins/introspection_data.py @@ -95,9 +95,11 @@ class SwiftStore(object): LOG.info('Introspection data was stored for node %(node)s in Swift ' 'object %(obj_name)s', {'node': node_uuid, 'obj_name': swift_object_name}) + # TODO(kaifeng) Remove the deprecated store_data_location at Train + # cycle. if CONF.processing.store_data_location: node_info = node_cache.get_node(node_uuid) - # TODO(kaifeng) node_info is not synced back, while we are not + # NOTE(kaifeng) node_info is not synced back, while we are not # using extra in the processing logic, it looks fine at the moment, # but we should consider refactor in a later time. node_info.patch([{'op': 'add', 'path': '/extra/%s' % diff --git a/releasenotes/notes/deprecate-store-data-location-037eaab9cd326646.yaml b/releasenotes/notes/deprecate-store-data-location-037eaab9cd326646.yaml new file mode 100644 index 000000000..b00fa0676 --- /dev/null +++ b/releasenotes/notes/deprecate-store-data-location-037eaab9cd326646.yaml @@ -0,0 +1,6 @@ +--- +deprecations: + - | + Deprecated the configuration option ``[processing]store_data_location``. + The introspection data could be retrieved from inspector, there is no + need to keep an extra link in ironic.