reverted my changes from https://code.launchpad.net/~berendt/nova/lp722554/+merge/50579 and reused the existing db api methods to add the disabled services. Looks much better now :)

i couldn't figure out how to uncommit and revert my changes in an already pushed branch, always ending in "ERROR: These branches have diverged.". So i created a new branch rev2 and a new proposal...
This commit is contained in:
Christian Berendt 2011-02-26 09:05:03 +00:00 committed by Tarmac
commit f623b52a89

View File

@ -553,7 +553,7 @@ class ServiceCommands(object):
args: [host] [service]"""
ctxt = context.get_admin_context()
now = datetime.datetime.utcnow()
services = db.service_get_all(ctxt)
services = db.service_get_all(ctxt) + db.service_get_all(ctxt, True)
if host:
services = [s for s in services if s['host'] == host]
if service: