Merge lp:~soren/nova/unify-default-flagfile-location into lp:~hudson-openstack/nova/trunk

[Soren Hansen]

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

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.

[Jay Pipes (jaypipes)]

FYI, I also have a solution to this in the new configuration options processing work...for later on :)

review: Approve

[Soren Hansen (soren)]

2010/11/23 Jay Pipes <email address hidden>:
> Review: Approve
> FYI, I also have a solution to this in the new configuration options processing work...for later on :)

I expected nothing less :)

--
Soren Hansen
Ubuntu Developer    http://www.ubuntu.com/
OpenStack Developer http://www.openstack.org/

[Devin Carlen (devcamcar)]

lgtm

review: Approve

=== modified file 'bin/nova-compute'
--- bin/nova-compute	2010-09-08 04:19:46 +0000
+++ bin/nova-compute	2010-11-23 12:48:36 +0000
@@ -34,10 +34,12 @@
 
 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

=== modified file 'bin/nova-instancemonitor'
--- bin/nova-instancemonitor	2010-09-08 08:45:39 +0000
+++ bin/nova-instancemonitor	2010-11-23 12:48:36 +0000
@@ -34,6 +34,7 @@
 if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
+from nova import utils
 from nova import twistd
 from nova.compute import monitor
 
@@ -44,6 +45,7 @@
     twistd.serve(__file__)
 
 if __name__ == '__builtin__':
+    utils.default_flagfile()
     logging.warn('Starting instance monitor')
     # pylint: disable-msg=C0103
     monitor = monitor.InstanceMonitor()

=== modified file 'bin/nova-manage'
--- bin/nova-manage	2010-10-21 18:49:51 +0000
+++ bin/nova-manage	2010-11-23 12:48:36 +0000
@@ -467,7 +467,7 @@
 
 def main():
     """Parse options and call the appropriate class/method."""
-    utils.default_flagfile('/etc/nova/nova-manage.conf')
+    utils.default_flagfile()
     argv = FLAGS(sys.argv)
 
     if FLAGS.verbose:

=== modified file 'bin/nova-network'
--- bin/nova-network	2010-09-08 04:19:46 +0000
+++ bin/nova-network	2010-11-23 12:48:36 +0000
@@ -34,10 +34,12 @@
 
 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-msg=C0103

=== modified file 'bin/nova-scheduler'
--- bin/nova-scheduler	2010-09-09 09:30:07 +0000
+++ bin/nova-scheduler	2010-11-23 12:48:36 +0000
@@ -34,10 +34,12 @@
 
 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()

=== modified file 'bin/nova-volume'
--- bin/nova-volume	2010-09-08 04:19:46 +0000
+++ bin/nova-volume	2010-11-23 12:48:36 +0000
@@ -34,10 +34,12 @@
 
 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-msg=C0103