openstack/ironic-python-agent
Code Issues Proposed changes

lldp-timeout kernel parameter missing ipa- prefix

Browse Source 
Every other Ironic python agent kernel parameter is prefixed with "ipa-".
This patch allows users to use the old "lldp-timeout" parameter or the new
"ipa-lldp-timeout" parameter. Warning message is logged if "lldp-timeout"
parameter is used.

(Also fixed typo while I'm at it.)

Change-Id: Icc05ead31506628e4926be6549916a19cad48db3
Closes-Bug: #1588325
This commit is contained in:
Yosef Hoffman 2016-06-02 10:57:31 -04:00
parent 90ba6452ef
commit 90c15e10cb
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ironic_python_agent/config.py
View File

@ -58,7 +58,7 @@ cli_opts = [
cfg.IntOpt('ip_lookup_sleep', cfg.IntOpt('ip_lookup_sleep',
default=int(APARAMS.get('ipa-ip-lookup-timeout', 10)), default=int(APARAMS.get('ipa-ip-lookup-timeout', 10)),
deprecated_name='ip-lookup-sleep', deprecated_name='ip-lookup-sleep',
help='The amaount of time to sleep between attempts' help='The amount of time to sleep between attempts'
'to determine IP address.'), 'to determine IP address.'),
cfg.StrOpt('network_interface', cfg.StrOpt('network_interface',
@ -88,7 +88,8 @@ cli_opts = [
help='The Ironic driver in use for this node'), help='The Ironic driver in use for this node'),
cfg.FloatOpt('lldp_timeout', cfg.FloatOpt('lldp_timeout',
default=APARAMS.get('lldp-timeout', 30.0), default=APARAMS.get('ipa-lldp-timeout',
APARAMS.get('lldp-timeout', 30.0)),
help='The amount of seconds to wait for LLDP packets.'), help='The amount of seconds to wait for LLDP packets.'),
cfg.BoolOpt('standalone', cfg.BoolOpt('standalone',

7
ironic_python_agent/utils.py
View File

@ -217,6 +217,13 @@ def get_agent_params():
# Cache the parameters so that it can be used later on. # Cache the parameters so that it can be used later on.
_set_cached_params(params) _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) return copy.deepcopy(params)

5
releasenotes/notes/prefix-lldp-timeout-50acc656313d8dd2.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- Every other Ironic python agent kernel parameter is prefixed with "ipa-".
This patch allows users to use the old "lldp-timeout" parameter or the
new "ipa-lldp-timeout" parameter.