diff options
| author | Derek Higgins <derekh@redhat.com> | 2017-03-24 14:03:56 +0000 |
|---|---|---|
| committer | Derek Higgins <derekh@redhat.com> | 2017-03-29 16:37:05 +0100 |
| commit | 000ade88a4e366dcc4c606c7c53977065fc2de49 (patch) | |
| tree | de82df6ab4cd6dd03ae552cae20512ee17b1eda5 | |
| parent | 99660b0cfb69c72e13813b4e3ddf0c070ca45942 (diff) | |
| download | ironic-000ade88a4e366dcc4c606c7c53977065fc2de49.tar.gz | |
Copy and append to static lists6.2.3
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 338651eae5b7c416f04970b9d60f09dc2dab8adb)
| -rw-r--r-- | ironic/drivers/base.py | 12 | ||||
| -rw-r--r-- | releasenotes/notes/bug-1672457-563d5354b41b060e.yaml | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/ironic/drivers/base.py b/ironic/drivers/base.py index af4aab9bc..3722fd605 100644 --- a/ironic/drivers/base.py +++ b/ironic/drivers/base.py @@ -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): diff --git a/releasenotes/notes/bug-1672457-563d5354b41b060e.yaml b/releasenotes/notes/bug-1672457-563d5354b41b060e.yaml new file mode 100644 index 000000000..b686dfd16 --- /dev/null +++ b/releasenotes/notes/bug-1672457-563d5354b41b060e.yaml @@ -0,0 +1,3 @@ +--- +fixes: + - Fixed a bug that was causing an increase in CPU usage over time. |