diff options
| author | Kaifeng Wang <kaifeng.w@gmail.com> | 2020-01-06 19:15:58 +0800 |
|---|---|---|
| committer | Kaifeng Wang <kaifeng.w@gmail.com> | 2021-01-15 16:13:52 +0800 |
| commit | 6072e2d65a45a0633d64f6ec9d39ec19b7e066ad (patch) | |
| tree | 56d57a2731a9265d037668d1ccd642936b4f3af3 | |
| parent | 8d5862d8b2ea9123807042e44e4263a5196b68e7 (diff) | |
| download | ironic-python-agent-6072e2d65a45a0633d64f6ec9d39ec19b7e066ad.tar.gz | |
Remove lldp-timeout support
The kernel parameter lldp-timeout was deprecated removed in this patch.
Change-Id: I98da49e61d9ed3236cc495d1ab351eba0931473b
| -rw-r--r-- | ironic_python_agent/config.py | 3 | ||||
| -rw-r--r-- | ironic_python_agent/utils.py | 7 | ||||
| -rw-r--r-- | releasenotes/notes/remove-lldp-timeout-ea481dbb01a39522.yaml | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/ironic_python_agent/config.py b/ironic_python_agent/config.py index 24d1f568..27ebfaf8 100644 --- a/ironic_python_agent/config.py +++ b/ironic_python_agent/config.py @@ -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.'), diff --git a/ironic_python_agent/utils.py b/ironic_python_agent/utils.py index a897210e..a8712a6a 100644 --- a/ironic_python_agent/utils.py +++ b/ironic_python_agent/utils.py @@ -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) diff --git a/releasenotes/notes/remove-lldp-timeout-ea481dbb01a39522.yaml b/releasenotes/notes/remove-lldp-timeout-ea481dbb01a39522.yaml new file mode 100644 index 00000000..032f8f57 --- /dev/null +++ b/releasenotes/notes/remove-lldp-timeout-ea481dbb01a39522.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + The kernel parameter ``lldp-timeout`` was deprecated during Newton + development cycle and removed, please use ``ipa-lldp-timeout`` + instead. |