summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-02-15 11:15:59 -0800
committerSandy Walsh <sandy.walsh@rackspace.com>2011-02-15 11:15:59 -0800
commit0020f14f43aa6f024d9aab7dc67c79caaaeb8257 (patch)
tree5d9046a57dc03e876ec2a7e3f8120aad53531eb8 /bin
parent59758207d490abb14045547d37e48c1f767f8956 (diff)
downloadnova-0020f14f43aa6f024d9aab7dc67c79caaaeb8257.tar.gz
nova-0020f14f43aa6f024d9aab7dc67c79caaaeb8257.tar.xz
nova-0020f14f43aa6f024d9aab7dc67c79caaaeb8257.zip
zone/info works
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 913c866bf..a0f552d64 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, volume, scheduler)
+ service.serve(compute, network, scheduler)
apps = []
paste_config_file = wsgi.paste_config_file('nova-api.conf')