Fixed Authors conflict and re-merged with trunk

7 files changed, 20 insertions, 5 deletions

diff --git a/bin/nova-compute b/bin/nova-compute
index 1724e9659..ac6378f75 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -34,9 +34,11 @@ 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__':
+    utils.default_flagfile()
     twistd.serve(__file__)
 
 if __name__ == '__builtin__':
diff --git a/bin/nova-instancemonitor b/bin/nova-instancemonitor
index 094da4033..9b6c40e82 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
 
@@ -41,6 +42,7 @@ logging.getLogger('boto').setLevel(logging.WARN)
 
 
 if __name__ == '__main__':
+    utils.default_flagfile()
     twistd.serve(__file__)
 
 if __name__ == '__builtin__':
diff --git a/bin/nova-manage b/bin/nova-manage
index 08b3da123..62eec8353 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -359,9 +359,14 @@ class ProjectCommands(object):
     def zipfile(self, project_id, user_id, filename='nova.zip'):
         """Exports credentials for project to a zip file
         arguments: project_id user_id [filename='nova.zip]"""
-        zip_file = self.manager.get_credentials(user_id, project_id)
-        with open(filename, 'w') as f:
-            f.write(zip_file)
+        try:
+            zip_file = self.manager.get_credentials(user_id, project_id)
+            with open(filename, 'w') as f:
+                f.write(zip_file)
+        except db.api.NoMoreNetworks:
+            print ('No more networks available. If this is a new '
+                   'installation, you need\nto call something like this:\n\n'
+                   '    nova-manage network create 10.0.0.0/8 10 64\n\n')
 
 
 class FloatingIpCommands(object):
@@ -467,7 +472,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..d1fb55261 100755
--- a/bin/nova-network
+++ b/bin/nova-network
@@ -34,9 +34,11 @@ 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__':
+    utils.default_flagfile()
     twistd.serve(__file__)
 
 if __name__ == '__builtin__':
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 38a8f213f..4d1a40cf1 100755
--- a/bin/nova-scheduler
+++ b/bin/nova-scheduler
@@ -34,9 +34,11 @@ 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__':
+    utils.default_flagfile()
     twistd.serve(__file__)
 
 if __name__ == '__builtin__':
diff --git a/bin/nova-volume b/bin/nova-volume
index b9e235717..e7281d6c0 100755
--- a/bin/nova-volume
+++ b/bin/nova-volume
@@ -34,9 +34,11 @@ 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__':
+    utils.default_flagfile()
     twistd.serve(__file__)
 
 if __name__ == '__builtin__':