summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMonsyne Dragon <mdragon@rackspace.com>2011-01-10 15:00:30 -0600
committerMonsyne Dragon <mdragon@rackspace.com>2011-01-10 15:00:30 -0600
commitd6a66d13718a41d5146d713ced192e795e72457e (patch)
treec28413f9254d6e62bd89d0654f95cd4aee9188a8
parent94f3782eb27fd63c64845f9ab59039d07ac7ba8c (diff)
whups, fix accidental change to nova-combined
-rwxr-xr-xbin/nova-combined3
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/nova-combined b/bin/nova-combined
index 4e49fd1fc..53322f1a0 100755
--- a/bin/nova-combined
+++ b/bin/nova-combined
@@ -60,8 +60,7 @@ if __name__ == '__main__':
scheduler = service.Service.create(binary='nova-scheduler')
#objectstore = service.Service.create(binary='nova-objectstore')
- #service.serve(compute, network, volume, scheduler)
- service.serve(compute, network, scheduler)
+ service.serve(compute, network, volume, scheduler)
server = wsgi.Server()
server.start(api.API('os'), FLAGS.osapi_port, host=FLAGS.osapi_host)