From 46bd31bc92657f4734dd59bbd323b83035e119df Mon Sep 17 00:00:00 2001 From: "vladimir.p" Date: Thu, 11 Aug 2011 13:45:55 -0700 Subject: [PATCH] capabilities fix, run_as_root fix --- nova/scheduler/manager.py | 4 ++-- nova/scheduler/zone_manager.py | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/nova/scheduler/manager.py b/nova/scheduler/manager.py index c8b16b622..294de62e4 100644 --- a/nova/scheduler/manager.py +++ b/nova/scheduler/manager.py @@ -71,8 +71,8 @@ class SchedulerManager(manager.Manager): def update_service_capabilities(self, context=None, service_name=None, host=None, capabilities=None): """Process a capability update from a service node.""" - if not capability: - capability = {} + if not capabilities: + capabilities = {} self.zone_manager.update_service_capabilities(service_name, host, capabilities) diff --git a/nova/scheduler/zone_manager.py b/nova/scheduler/zone_manager.py index 71889e99f..9d05ea42e 100644 --- a/nova/scheduler/zone_manager.py +++ b/nova/scheduler/zone_manager.py @@ -197,8 +197,6 @@ class ZoneManager(object): def update_service_capabilities(self, service_name, host, capabilities): """Update the per-service capabilities based on this notification.""" - # logging.debug(_("Received %(service_name)s service update from " - # "%(host)s: %(capabilities)s") % locals()) logging.debug(_("Received %(service_name)s service update from " "%(host)s.") % locals()) service_caps = self.service_states.get(host, {})