diff options
| author | Monsyne Dragon <mdragon@rackspace.com> | 2011-01-05 22:11:05 -0600 |
|---|---|---|
| committer | Monsyne Dragon <mdragon@rackspace.com> | 2011-01-05 22:11:05 -0600 |
| commit | b55940e8e3d977960ff60f4cb7cff4b6ea2e8fb8 (patch) | |
| tree | 1115bf6dc7b6376a13fd4d68f1ebce7d9028ec71 /bin | |
| parent | f9fa25f9a873c1e4831c342689f7b5adc8f41013 (diff) | |
| download | nova-b55940e8e3d977960ff60f4cb7cff4b6ea2e8fb8.tar.gz nova-b55940e8e3d977960ff60f4cb7cff4b6ea2e8fb8.tar.xz nova-b55940e8e3d977960ff60f4cb7cff4b6ea2e8fb8.zip | |
fix some glitches due to someone removing instanc.internal_id (not that I mind)
remove accidental change to nova-combined script
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-combined | 5 |
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) |