Merge "Deprecates [processing]store_data_location"
This commit is contained in:
commit
3b6cffef54
|
@ -80,7 +80,11 @@ _OPTS = [
|
||||||
'not be stored.')),
|
'not be stored.')),
|
||||||
cfg.StrOpt('store_data_location',
|
cfg.StrOpt('store_data_location',
|
||||||
help=_('Name of the key to store the location of stored data '
|
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',
|
cfg.BoolOpt('disk_partitioning_spacing',
|
||||||
default=True,
|
default=True,
|
||||||
help=_('Whether to leave 1 GiB of disk size untouched for '
|
help=_('Whether to leave 1 GiB of disk size untouched for '
|
||||||
|
|
|
@ -95,9 +95,11 @@ class SwiftStore(object):
|
||||||
LOG.info('Introspection data was stored for node %(node)s in Swift '
|
LOG.info('Introspection data was stored for node %(node)s in Swift '
|
||||||
'object %(obj_name)s', {'node': node_uuid,
|
'object %(obj_name)s', {'node': node_uuid,
|
||||||
'obj_name': swift_object_name})
|
'obj_name': swift_object_name})
|
||||||
|
# TODO(kaifeng) Remove the deprecated store_data_location at Train
|
||||||
|
# cycle.
|
||||||
if CONF.processing.store_data_location:
|
if CONF.processing.store_data_location:
|
||||||
node_info = node_cache.get_node(node_uuid)
|
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,
|
# using extra in the processing logic, it looks fine at the moment,
|
||||||
# but we should consider refactor in a later time.
|
# but we should consider refactor in a later time.
|
||||||
node_info.patch([{'op': 'add', 'path': '/extra/%s' %
|
node_info.patch([{'op': 'add', 'path': '/extra/%s' %
|
||||||
|
|
|
@ -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.
|
Loading…
Reference in New Issue