From 4d06429290a373ae3a42b1f9b58d7253d269e048 Mon Sep 17 00:00:00 2001
From: Andy Smith <code@term.ie>
Date: Thu, 9 Dec 2010 16:45:51 -0800
Subject: add back utils.default_flagflie

---
 bin/nova-api       | 1 +
 bin/nova-combined  | 2 ++
 bin/nova-compute   | 2 ++
 bin/nova-network   | 2 ++
 bin/nova-scheduler | 2 ++
 bin/nova-volume    | 2 ++
 6 files changed, 11 insertions(+)

(limited to 'bin')

diff --git a/bin/nova-api b/bin/nova-api
index 3505cefe7..210486666 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -52,4 +52,5 @@ def main():
 
 
 if __name__ == '__main__':
+    utils.default_flagfile()
     main()
diff --git a/bin/nova-combined b/bin/nova-combined
index 964ffd438..e82b9c9b6 100755
--- a/bin/nova-combined
+++ b/bin/nova-combined
@@ -36,6 +36,7 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
 from nova import api
 from nova import flags
 from nova import service
+from nova import utils
 from nova import wsgi
 
 
@@ -50,6 +51,7 @@ flags.DEFINE_string('ec2api_host', '0.0.0.0', 'EC2 API host')
 
 
 if __name__ == '__main__':
+    utils.default_flagfile()
     FLAGS(sys.argv)
     
     compute = service.Service.create(binary='nova-compute')
diff --git a/bin/nova-compute b/bin/nova-compute
index f224f0690..8b02cd0f5 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -34,7 +34,9 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
 from nova import service
+from nova import utils
 
 if __name__ == '__main__':
+    utils.default_flagfile()
     service.serve()
     service.wait()
diff --git a/bin/nova-network b/bin/nova-network
index 589c75e5a..01cc9d00d 100755
--- a/bin/nova-network
+++ b/bin/nova-network
@@ -34,7 +34,9 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
 from nova import service
+from nova import utils
 
 if __name__ == '__main__':
+    utils.default_flagfile()
     service.serve()
     service.wait()
diff --git a/bin/nova-scheduler b/bin/nova-scheduler
index cb345aa3f..a46dd8dda 100755
--- a/bin/nova-scheduler
+++ b/bin/nova-scheduler
@@ -34,7 +34,9 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
 from nova import service
+from nova import utils
 
 if __name__ == '__main__':
+    utils.default_flagfile()
     service.serve()
     service.wait()
diff --git a/bin/nova-volume b/bin/nova-volume
index 2f74f4b9a..efb837ba2 100755
--- a/bin/nova-volume
+++ b/bin/nova-volume
@@ -34,7 +34,9 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
 from nova import service
+from nova import utils
 
 if __name__ == '__main__':
+    utils.default_flagfile()
     service.serve()
     service.wait()
-- 
cgit