capabilities fix, run_as_root fix

This commit is contained in:
vladimir.p
2011-08-11 13:45:55 -07:00
parent c9280362da
commit 46bd31bc92
2 changed files with 2 additions and 4 deletions

View File

@@ -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)

View File

@@ -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, {})