diff options
| author | termie <code@term.ie> | 2010-12-14 16:05:39 -0800 |
|---|---|---|
| committer | termie <code@term.ie> | 2010-12-14 16:05:39 -0800 |
| commit | a2a8406b5d793545c8ecb359e18b80bba618c509 (patch) | |
| tree | ad49bdbff6c6594c568949c84197c29fdab0d3ec /bin | |
| parent | c835c441981a17764931390bc1ace6121ab100a4 (diff) | |
| download | nova-a2a8406b5d793545c8ecb359e18b80bba618c509.tar.gz nova-a2a8406b5d793545c8ecb359e18b80bba618c509.tar.xz nova-a2a8406b5d793545c8ecb359e18b80bba618c509.zip | |
updates per review
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-api | 9 | ||||
| -rwxr-xr-x | bin/nova-combined | 3 | ||||
| -rwxr-xr-x | bin/nova-scheduler | 2 |
3 files changed, 4 insertions, 10 deletions
diff --git a/bin/nova-api b/bin/nova-api index 210486666..3f433ea6d 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -36,6 +36,7 @@ from nova import flags from nova import utils 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') @@ -43,14 +44,10 @@ flags.DEFINE_integer('ec2api_port', 8773, 'EC2 API port') flags.DEFINE_string('ec2api_host', '0.0.0.0', 'EC2 API host') -def main(): +if __name__ == '__main__': + utils.default_flagfile() FLAGS(sys.argv) server = wsgi.Server() server.start(api.API('os'), FLAGS.osapi_port, host=FLAGS.osapi_host) server.start(api.API('ec2'), FLAGS.ec2api_port, host=FLAGS.ec2api_host) server.wait() - - -if __name__ == '__main__': - utils.default_flagfile() - main() diff --git a/bin/nova-combined b/bin/nova-combined index e82b9c9b6..5f635b3a3 100755 --- a/bin/nova-combined +++ b/bin/nova-combined @@ -41,9 +41,6 @@ from nova import wsgi FLAGS = flags.FLAGS -flags.DEFINE_integer('api_port', 8773, 'API port') - -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') diff --git a/bin/nova-scheduler b/bin/nova-scheduler index a46dd8dda..59cb060d4 100755 --- a/bin/nova-scheduler +++ b/bin/nova-scheduler @@ -17,7 +17,7 @@ # License for the specific language governing permissions and limitations # under the License. -""" Starter script for Nova Scheduler.""" +"""Starter script for Nova Scheduler.""" import eventlet eventlet.monkey_patch() |