Unify the location of the default flagfile.

Not all workers called utils.default_flagfile, and nova-manage
explicitly said to use the one in /etc/nova/nova-manage.conf.

This 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 commit is contained in:
Soren Hansen
2010-11-23 11:45:56 +01:00
parent 8a86c10f39
commit e90d5a8e20
6 changed files with 11 additions and 1 deletions

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 twistd
from nova import utils
if __name__ == '__main__':
twistd.serve(__file__)
if __name__ == '__builtin__':
utils.default_flagfile()
application = service.Service.create() # pylint: disable=C0103