openstack/nova
Code Issues Proposed changes

Make sure all workers look for their flagfile in the same spot.

Browse Source 
Stop nova-manage from using /etc/nova/nova-manage.conf as its default
flagfile. This made made development awkward since everything but
nova-manage would use defaults for everything, but nova-manage would use
whatever config was in /etc/nova/nova-manage.conf which was likely put
there by a package of some sort.

This way, we can leave it to the packagers to set this default to
something else.
This commit is contained in:
Soren Hansen 2010-11-24 19:09:42 +00:00 committed by Tarmac
commit 07ee9639a1
6 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/nova-compute
View File

@ -34,10 +34,12 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
from nova import service from nova import service
from nova import twistd from nova import twistd
from nova import utils
if __name__ == '__main__': if __name__ == '__main__':
twistd.serve(__file__) twistd.serve(__file__)
if __name__ == '__builtin__': if __name__ == '__builtin__':
utils.default_flagfile()
application = service.Service.create() # pylint: disable=C0103 application = service.Service.create() # pylint: disable=C0103

2
bin/nova-instancemonitor
View File

@ -34,6 +34,7 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
sys.path.insert(0, possible_topdir) sys.path.insert(0, possible_topdir)
from nova import utils
from nova import twistd from nova import twistd
from nova.compute import monitor from nova.compute import monitor
@ -44,6 +45,7 @@ if __name__ == '__main__':
twistd.serve(__file__) twistd.serve(__file__)
if __name__ == '__builtin__': if __name__ == '__builtin__':
utils.default_flagfile()
logging.warn('Starting instance monitor') logging.warn('Starting instance monitor')
# pylint: disable-msg=C0103 # pylint: disable-msg=C0103
monitor = monitor.InstanceMonitor() monitor = monitor.InstanceMonitor()

2
bin/nova-manage
View File

@ -467,7 +467,7 @@ def methods_of(obj):
def main(): def main():
"""Parse options and call the appropriate class/method.""" """Parse options and call the appropriate class/method."""
utils.default_flagfile('/etc/nova/nova-manage.conf') utils.default_flagfile()
argv = FLAGS(sys.argv) argv = FLAGS(sys.argv)
if FLAGS.verbose: if FLAGS.verbose:

2
bin/nova-network
View File

@ -34,10 +34,12 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
from nova import service from nova import service
from nova import twistd from nova import twistd
from nova import utils
if __name__ == '__main__': if __name__ == '__main__':
twistd.serve(__file__) twistd.serve(__file__)
if __name__ == '__builtin__': if __name__ == '__builtin__':
utils.default_flagfile()
application = service.Service.create() # pylint: disable-msg=C0103 application = service.Service.create() # pylint: disable-msg=C0103

2
bin/nova-scheduler
View File

@ -34,10 +34,12 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
from nova import service from nova import service
from nova import twistd from nova import twistd
from nova import utils
if __name__ == '__main__': if __name__ == '__main__':
twistd.serve(__file__) twistd.serve(__file__)
if __name__ == '__builtin__': if __name__ == '__builtin__':
utils.default_flagfile()
application = service.Service.create() application = service.Service.create()

2
bin/nova-volume
View File

@ -34,10 +34,12 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
from nova import service from nova import service
from nova import twistd from nova import twistd
from nova import utils
if __name__ == '__main__': if __name__ == '__main__':
twistd.serve(__file__) twistd.serve(__file__)
if __name__ == '__builtin__': if __name__ == '__builtin__':
utils.default_flagfile()
application = service.Service.create() # pylint: disable-msg=C0103 application = service.Service.create() # pylint: disable-msg=C0103