diff options
| author | Eric Day <eday@oddments.org> | 2010-12-02 08:47:25 -0800 |
|---|---|---|
| committer | Eric Day <eday@oddments.org> | 2010-12-02 08:47:25 -0800 |
| commit | 1bcc4da8bbcfdfee8f5eed80e9115d51803f86e2 (patch) | |
| tree | a54a08c909df2bc63beb741e3f48e69ba94d83c8 /bin | |
| parent | 6956057ac490c788cb94fbfd0af7fe6e91a7ca96 (diff) | |
| parent | f8afbcc08b65d4d6764a6dc66c804816573ab3b4 (diff) | |
| download | nova-1bcc4da8bbcfdfee8f5eed80e9115d51803f86e2.tar.gz nova-1bcc4da8bbcfdfee8f5eed80e9115d51803f86e2.tar.xz nova-1bcc4da8bbcfdfee8f5eed80e9115d51803f86e2.zip | |
Merged trunk and resolved conflicts.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-compute | 2 | ||||
| -rwxr-xr-x | bin/nova-instancemonitor | 2 | ||||
| -rwxr-xr-x | bin/nova-network | 2 | ||||
| -rwxr-xr-x | bin/nova-objectstore | 2 | ||||
| -rwxr-xr-x | bin/nova-scheduler | 2 | ||||
| -rwxr-xr-x | bin/nova-volume | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/bin/nova-compute b/bin/nova-compute index a66477af5..ac6378f75 100755 --- a/bin/nova-compute +++ b/bin/nova-compute @@ -38,8 +38,8 @@ from nova import utils if __name__ == '__main__': + utils.default_flagfile() twistd.serve(__file__) if __name__ == '__builtin__': - utils.default_flagfile() application = service.Service.create() # pylint: disable=C0103 diff --git a/bin/nova-instancemonitor b/bin/nova-instancemonitor index a7b7fb0c6..9b6c40e82 100755 --- a/bin/nova-instancemonitor +++ b/bin/nova-instancemonitor @@ -42,10 +42,10 @@ logging.getLogger('boto').setLevel(logging.WARN) if __name__ == '__main__': + utils.default_flagfile() twistd.serve(__file__) if __name__ == '__builtin__': - utils.default_flagfile() logging.warn('Starting instance monitor') # pylint: disable-msg=C0103 monitor = monitor.InstanceMonitor() diff --git a/bin/nova-network b/bin/nova-network index 342a63058..d1fb55261 100755 --- a/bin/nova-network +++ b/bin/nova-network @@ -38,8 +38,8 @@ from nova import utils if __name__ == '__main__': + utils.default_flagfile() twistd.serve(__file__) if __name__ == '__builtin__': - utils.default_flagfile() application = service.Service.create() # pylint: disable-msg=C0103 diff --git a/bin/nova-objectstore b/bin/nova-objectstore index 728f2ee5b..00ae27af9 100755 --- a/bin/nova-objectstore +++ b/bin/nova-objectstore @@ -42,8 +42,8 @@ FLAGS = flags.FLAGS if __name__ == '__main__': + utils.default_flagfile() twistd.serve(__file__) if __name__ == '__builtin__': - utils.default_flagfile() application = handler.get_application() # pylint: disable-msg=C0103 diff --git a/bin/nova-scheduler b/bin/nova-scheduler index 069b5a6fa..4d1a40cf1 100755 --- a/bin/nova-scheduler +++ b/bin/nova-scheduler @@ -38,8 +38,8 @@ from nova import utils if __name__ == '__main__': + utils.default_flagfile() twistd.serve(__file__) if __name__ == '__builtin__': - utils.default_flagfile() application = service.Service.create() diff --git a/bin/nova-volume b/bin/nova-volume index 26148b0ec..e7281d6c0 100755 --- a/bin/nova-volume +++ b/bin/nova-volume @@ -38,8 +38,8 @@ from nova import utils if __name__ == '__main__': + utils.default_flagfile() twistd.serve(__file__) if __name__ == '__builtin__': - utils.default_flagfile() application = service.Service.create() # pylint: disable-msg=C0103 |