summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-02-17 16:18:03 -0400
committerSandy Walsh <sandy.walsh@rackspace.com>2011-02-17 16:18:03 -0400
commite77f8751dd59e5d650d047a6711c3d137947dda7 (patch)
tree7d09de669ac1b1eb312142582ffed4fc4dcc29c4 /bin
parentaa71a25c9f9bf5df3aea781138fa8d69654f06d9 (diff)
fixup
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-combined4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/nova-combined b/bin/nova-combined
index a0f552d64..913c866bf 100755
--- a/bin/nova-combined
+++ b/bin/nova-combined
@@ -53,11 +53,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, scheduler)
+ service.serve(compute, network, volume, scheduler)
apps = []
paste_config_file = wsgi.paste_config_file('nova-api.conf')