diff options
| author | Nachi Ueno <ueno.nachi@lab.ntt.co.jp> | 2011-01-13 09:28:35 +0900 |
|---|---|---|
| committer | Nachi Ueno <ueno.nachi@lab.ntt.co.jp> | 2011-01-13 09:28:35 +0900 |
| commit | 7bc94bb337bc3cdb0270a8316f8be097aff26ec1 (patch) | |
| tree | b2ae2e6cd1d9b29d7bbeb3bfe75c2ae4ca18da8f /bin | |
| parent | df0be0318cf22d250bdf9abdd9ed3b91bb83f0ea (diff) | |
| parent | 27369c18bde257c068ffc51e5ef51b479ad351d0 (diff) | |
| download | nova-7bc94bb337bc3cdb0270a8316f8be097aff26ec1.tar.gz nova-7bc94bb337bc3cdb0270a8316f8be097aff26ec1.tar.xz nova-7bc94bb337bc3cdb0270a8316f8be097aff26ec1.zip | |
merged with r555
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-api | 1 | ||||
| -rwxr-xr-x | bin/nova-combined | 1 | ||||
| -rwxr-xr-x | bin/nova-manage | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/bin/nova-api b/bin/nova-api index 1c671201e..c7cbb3ab4 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -41,7 +41,6 @@ from nova import wsgi FLAGS = flags.FLAGS -flags.DEFINE_integer('osapi_port', 8774, 'OpenStack API port') flags.DEFINE_string('osapi_host', '0.0.0.0', 'OpenStack API host') flags.DEFINE_integer('ec2api_port', 8773, 'EC2 API port') flags.DEFINE_string('ec2api_host', '0.0.0.0', 'EC2 API host') diff --git a/bin/nova-combined b/bin/nova-combined index 53322f1a0..f932fdfd5 100755 --- a/bin/nova-combined +++ b/bin/nova-combined @@ -44,7 +44,6 @@ from nova import wsgi FLAGS = flags.FLAGS -flags.DEFINE_integer('osapi_port', 8774, 'OpenStack API port') flags.DEFINE_string('osapi_host', '0.0.0.0', 'OpenStack API host') flags.DEFINE_integer('ec2api_port', 8773, 'EC2 API port') flags.DEFINE_string('ec2api_host', '0.0.0.0', 'EC2 API host') diff --git a/bin/nova-manage b/bin/nova-manage index 62ee10b41..b5842b595 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -77,12 +77,14 @@ from nova import crypto from nova import db from nova import exception from nova import flags +from nova import log as logging from nova import quota from nova import utils from nova.auth import manager from nova.cloudpipe import pipelib +logging.basicConfig() FLAGS = flags.FLAGS flags.DECLARE('fixed_range', 'nova.network.manager') flags.DECLARE('num_networks', 'nova.network.manager') |