From b3c2d3af1fac4c3cda89ec78c54c2de1a47b0f90 Mon Sep 17 00:00:00 2001 From: Bruno Grazioli Date: Fri, 17 Jun 2016 17:33:40 +0200 Subject: [PATCH] Check if nova-service is already disabled This patch updates VM workload consolidation strategy adding a new condition to check whether nova-compute service is disabled before creating the action. Change-Id: I1accbc7bbd62684dce14ca3b35c92121e923a73a Closes-Bug: #1591927 --- .../strategy/strategies/vm_workload_consolidation.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py b/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py index bca5ed178..46d71df29 100644 --- a/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py +++ b/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py @@ -204,7 +204,9 @@ class VMWorkloadConsolidation(base.ServerConsolidationBaseStrategy): :return: None """ for hypervisor in model.get_all_hypervisors().values(): - if len(model.get_mapping().get_node_vms(hypervisor)) == 0: + if (len(model.get_mapping().get_node_vms(hypervisor)) == 0 and + hypervisor.status != + hyper_state.HypervisorState.DISABLED.value): self.add_action_deactivate_hypervisor(hypervisor) def get_prediction_model(self):