Merge "Check if nova-service is already disabled"

2016-06-21 08:40:17 +00:00
parent 4fc3307525 b3c2d3af1f
commit e3edc67045
1 changed files with 3 additions and 1 deletions
--- 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):