Copy and append to static lists
core_interfaces and standard_interfaces are both static members of BaseDriver
we need to take a copy of them before appending to them.
Conflicts:
ironic/drivers/base.py
Change-Id: Ic6edc5e49a25849c7871dbc9e6e1d5a5eb229e57
Closes-Bug: #1672457
(cherry picked from commit 338651eae5
)
This commit is contained in:
parent
99660b0cfb
commit
000ade88a4
|
@ -129,7 +129,6 @@ class BaseDriver(object):
|
|||
"""
|
||||
standard_interfaces.append('raid')
|
||||
|
||||
@abc.abstractmethod
|
||||
def __init__(self):
|
||||
pass
|
||||
|
||||
|
@ -162,13 +161,12 @@ class BareDriver(BaseDriver):
|
|||
class, as well as appended to core_interfaces or standard_interfaces here.
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
self.network = None
|
||||
"""`Core` attribute for network connectivity.
|
||||
network = None
|
||||
"""`Core` attribute for network connectivity.
|
||||
|
||||
A reference to an instance of :class:NetworkInterface.
|
||||
"""
|
||||
self.core_interfaces.append('network')
|
||||
A reference to an instance of :class:NetworkInterface.
|
||||
"""
|
||||
core_interfaces = BaseDriver.core_interfaces + ['network']
|
||||
|
||||
|
||||
class BaseInterface(object):
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
---
|
||||
fixes:
|
||||
- Fixed a bug that was causing an increase in CPU usage over time.
|
Loading…
Reference in New Issue