Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add fix for __init__() error"

Browse Source
This commit is contained in:
Jenkins
2016-06-02 08:46:54 +00:00
committed by Gerrit Code Review
parent a457707e56 5d66f66050
commit 46091385d8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
watcher/decision_engine/strategy/strategies/workload_balance.py
View File

@@ -68,12 +68,12 @@ class WorkloadBalance(base.BaseStrategy):
MIGRATION = "migrate"
def __init__(self, osc=None):
def __init__(self, config=None, osc=None):
"""Using live migration
:param osc: an OpenStackClients object
"""
super(WorkloadBalance, self).__init__(osc)
super(WorkloadBalance, self).__init__(config, osc)
# the migration plan will be triggered when the CPU utlization %
# reaches threshold
# TODO(Junjie): Threshold should be configurable for each audit

4
watcher/decision_engine/strategy/strategies/workload_stabilization.py
View File

@@ -108,8 +108,8 @@ class WorkloadStabilization(base.WorkloadStabilizationBaseStrategy):
MIGRATION = "migrate"
MEMOIZE = _set_memoize(CONF)
def __init__(self, osc=None):
super(WorkloadStabilization, self).__init__(osc)
def __init__(self, config=None, osc=None):
super(WorkloadStabilization, self).__init__(config, osc)
self._ceilometer = None
self._nova = None
self.weights = CONF['watcher_strategies.workload_stabilization']\