summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-combined5
1 files changed, 2 insertions, 3 deletions
diff --git a/bin/nova-combined b/bin/nova-combined
index a1d2cdc66..53322f1a0 100755
--- a/bin/nova-combined
+++ b/bin/nova-combined
@@ -56,12 +56,11 @@ if __name__ == '__main__':
compute = service.Service.create(binary='nova-compute')
network = service.Service.create(binary='nova-network')
-# volume = service.Service.create(binary='nova-volume')
+ volume = service.Service.create(binary='nova-volume')
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)