openstack/ironic-python-agent
Code Issues Proposed changes

Remove lldp-timeout support

Browse Source 
The kernel parameter lldp-timeout was deprecated removed in this patch.

Change-Id: I98da49e61d9ed3236cc495d1ab351eba0931473b
This commit is contained in:
Kaifeng Wang 2020-01-06 19:15:58 +08:00
parent 8d5862d8b2
commit 6072e2d65a
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ironic_python_agent/config.py
View File

@ -139,8 +139,7 @@ cli_opts = [
'kernel parameter.'),
cfg.FloatOpt('lldp_timeout',
default=APARAMS.get('ipa-lldp-timeout',
APARAMS.get('lldp-timeout', 30.0)),
default=APARAMS.get('ipa-lldp-timeout', 30.0),
help='The amount of seconds to wait for LLDP packets. '
'Can be supplied as "ipa-lldp-timeout" '
'kernel parameter.'),

7
ironic_python_agent/utils.py
View File

@ -302,13 +302,6 @@ def get_agent_params():
# Cache the parameters so that it can be used later on.
_set_cached_params(params)
# Check to see if any deprecated parameters have been used
deprecated_params = {'lldp-timeout': 'ipa-lldp-timeout'}
for old_param, new_param in deprecated_params.items():
if params.get(old_param) is not None:
LOG.warning("The parameter '%s' has been deprecated. Please "
"use %s instead.", old_param, new_param)
return copy.deepcopy(params)

6
releasenotes/notes/remove-lldp-timeout-ea481dbb01a39522.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
The kernel parameter ``lldp-timeout`` was deprecated during Newton
development cycle and removed, please use ``ipa-lldp-timeout``
instead.