diff options
| author | Brian Lamar <brian.lamar@rackspace.com> | 2011-06-23 10:06:44 -0400 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2011-06-23 10:06:44 -0400 |
| commit | 2690e31bbd8c515771ca69a0a73e9ff5761a9079 (patch) | |
| tree | d30b12abd962fc43e4a44fad207cefd0776e15c8 /bin/nova-api | |
| parent | 186598a819c4e9c4b1b76aad61e7df56cdddd5be (diff) | |
| parent | 2059a683e11169a35b35819575926fc6cbc1a3f1 (diff) | |
Merged markwash's fixes.
Diffstat (limited to 'bin/nova-api')
| -rwxr-xr-x | bin/nova-api | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/nova-api b/bin/nova-api index b94928c7b..121f6f9a0 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -31,10 +31,11 @@ import nova.service def main(): """Launch EC2 and OSAPI services.""" + launcher = nova.service.Launcher(sys.argv) + ec2 = nova.service.WSGIService("ec2") osapi = nova.service.WSGIService("osapi") - launcher = nova.service.Launcher(sys.argv) launcher.launch_service(ec2) launcher.launch_service(osapi) |