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.

6 files changed, 11 insertions, 1 deletions

diff --git a/bin/nova-compute b/bin/nova-compute
index 1724e9659..a66477af5 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -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
diff --git a/bin/nova-instancemonitor b/bin/nova-instancemonitor
index 094da4033..a7b7fb0c6 100755
--- a/bin/nova-instancemonitor
+++ b/bin/nova-instancemonitor
@@ -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')):
     sys.path.insert(0, possible_topdir)
 
+from nova import utils
 from nova import twistd
 from nova.compute import monitor
 
@@ -44,6 +45,7 @@ if __name__ == '__main__':
     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-manage b/bin/nova-manage
index 08b3da123..eb7c6b87b 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -467,7 +467,7 @@ def methods_of(obj):
 
 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:
diff --git a/bin/nova-network b/bin/nova-network
index fa88aeb47..342a63058 100755
--- a/bin/nova-network
+++ b/bin/nova-network
@@ -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-msg=C0103
diff --git a/bin/nova-scheduler b/bin/nova-scheduler
index 38a8f213f..069b5a6fa 100755
--- a/bin/nova-scheduler
+++ b/bin/nova-scheduler
@@ -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()
diff --git a/bin/nova-volume b/bin/nova-volume
index b9e235717..26148b0ec 100755
--- a/bin/nova-volume
+++ b/bin/nova-volume
@@ -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-msg=C0103