From 5d66f660508c7b4e2308779529b31eef07b94212 Mon Sep 17 00:00:00 2001 From: Alexander Chadin Date: Wed, 1 Jun 2016 13:38:54 +0300 Subject: [PATCH] Add fix for __init__() error This patch set fixes __init__() got multiple values for keyword argument osc error. Closes-Bug: #1587824 Change-Id: Ieaa1250774ec0fdab5450fe9c3962bb3d1f4136b --- .../decision_engine/strategy/strategies/workload_balance.py | 4 ++-- .../strategy/strategies/workload_stabilization.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/watcher/decision_engine/strategy/strategies/workload_balance.py b/watcher/decision_engine/strategy/strategies/workload_balance.py index 15bbc72b4..4f0338cdc 100644 --- a/watcher/decision_engine/strategy/strategies/workload_balance.py +++ b/watcher/decision_engine/strategy/strategies/workload_balance.py @@ -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 diff --git a/watcher/decision_engine/strategy/strategies/workload_stabilization.py b/watcher/decision_engine/strategy/strategies/workload_stabilization.py index e0de7c633..cdc4bcca6 100644 --- a/watcher/decision_engine/strategy/strategies/workload_stabilization.py +++ b/watcher/decision_engine/strategy/strategies/workload_stabilization.py @@ -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']\