diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-02-17 12:45:53 -0800 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-02-17 12:45:53 -0800 |
| commit | b47cc07a7d3be1653bbcfa3215e3427e5cc796cb (patch) | |
| tree | 93a7de2758d3d8b379861200dd2129e8bf5a4c29 /bin | |
| parent | b48201be9a5fa08ce21ef241052071800e5777ca (diff) | |
| parent | e77f8751dd59e5d650d047a6711c3d137947dda7 (diff) | |
merge with trunk
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-combined | 4 |
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') |