summaryrefslogtreecommitdiffstats
path: root/bin/nova-api
diff options
context:
space:
mode:
authorBrian Lamar <brian.lamar@rackspace.com>2011-06-23 21:31:00 -0400
committerBrian Lamar <brian.lamar@rackspace.com>2011-06-23 21:31:00 -0400
commit655a783d5a0ef2ddadcf119793cd34513a45fe27 (patch)
tree0c48676a13c628c802028d2e3c6402de10cd6051 /bin/nova-api
parent2690e31bbd8c515771ca69a0a73e9ff5761a9079 (diff)
Created Bootstrapper to handle Nova bootstrapping logic.
Diffstat (limited to 'bin/nova-api')
-rwxr-xr-xbin/nova-api5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/nova-api b/bin/nova-api
index 121f6f9a0..ea99a1b48 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -25,17 +25,18 @@ Starts both the EC2 and OpenStack APIs in separate processes.
import sys
-import nova.log
import nova.service
+import nova.utils
def main():
"""Launch EC2 and OSAPI services."""
- launcher = nova.service.Launcher(sys.argv)
+ nova.utils.Bootstrapper.bootstrap_binary(sys.argv)
ec2 = nova.service.WSGIService("ec2")
osapi = nova.service.WSGIService("osapi")
+ launcher = nova.service.Launcher()
launcher.launch_service(ec2)
launcher.launch_service(osapi)