Merge with orm_deux (fixing up style changes in my stuff at the same time).

10 files changed, 103 insertions, 9 deletions

diff --git a/bin/nova-api b/bin/nova-api
index a3ad5a0e1..ede09d38c 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -22,9 +22,19 @@ Tornado daemon for the main API endpoint.
 """
 
 import logging
+import os
+import sys
 from tornado import httpserver
 from tornado import ioloop
 
+# If ../nova/__init__.py exists, add ../ to Python search path, so that
+# it will override what happens to be installed in /usr/(local/)lib/python...
+possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
+                                   os.pardir,
+                                   os.pardir))
+if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
+    sys.path.insert(0, possible_topdir)
+
 from nova import flags
 from nova import server
 from nova import utils
diff --git a/bin/nova-api-new b/bin/nova-api-new
index fda42339c..8625c487f 100755
--- a/bin/nova-api-new
+++ b/bin/nova-api-new
@@ -21,6 +21,17 @@
 Nova API daemon.
 """
 
+import os
+import sys
+
+# If ../nova/__init__.py exists, add ../ to Python search path, so that
+# it will override what happens to be installed in /usr/(local/)lib/python...
+possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
+                                   os.pardir,
+                                   os.pardir))
+if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
+    sys.path.insert(0, possible_topdir)
+
 from nova import api
 from nova import flags
 from nova import utils
diff --git a/bin/nova-compute b/bin/nova-compute
index cc4c9e2ff..1724e9659 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -21,6 +21,17 @@
   Twistd daemon for the nova compute nodes.
 """
 
+import os
+import sys
+
+# If ../nova/__init__.py exists, add ../ to Python search path, so that
+# it will override what happens to be installed in /usr/(local/)lib/python...
+possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
+                                   os.pardir,
+                                   os.pardir))
+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 twistd
 
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge
index c416d07a7..c4795cca2 100755
--- a/bin/nova-dhcpbridge
+++ b/bin/nova-dhcpbridge
@@ -25,21 +25,25 @@ import logging
 import os
 import sys
 
-# TODO(joshua): there is concern that the user dnsmasq runs under will not
-#               have nova in the path. This should be verified and if it is
-#               not true the ugly line below can be removed
-sys.path.append(os.path.abspath(os.path.join(__file__, "../../")))
+# If ../nova/__init__.py exists, add ../ to Python search path, so that
+# it will override what happens to be installed in /usr/(local/)lib/python...
+possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
+                                   os.pardir,
+                                   os.pardir))
+if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
+    sys.path.insert(0, possible_topdir)
 
 from nova import db
 from nova import flags
 from nova import rpc
 from nova import utils
-from nova import datastore  # for redis_db flag
-from nova.auth import manager  # for auth flags
 from nova.network import linux_net
-from nova.network import manager  # for network flags
 
 FLAGS = flags.FLAGS
+flags.DECLARE('auth_driver', 'nova.auth.manager')
+flags.DECLARE('redis_db', 'nova.datastore')
+flags.DECLARE('network_size', 'nova.network.manager')
+flags.DECLARE('num_networks', 'nova.network.manager')
 
 
 def add_lease(_mac, ip_address, _hostname, _interface):
@@ -80,7 +84,6 @@ def init_leases(interface):
 
 
 def main():
-    global network_manager
     """Parse environment and arguments and call the approproate action."""
     flagfile = os.environ.get('FLAGFILE', FLAGS.dhcpbridge_flagfile)
     utils.default_flagfile(flagfile)
@@ -99,7 +102,6 @@ def main():
                                             '_trial_temp',
                                             'nova.sqlite'))
         FLAGS.sql_connection = 'sqlite:///%s' % path
-        #FLAGS.sql_connection = 'mysql://root@localhost/test'
     action = argv[1]
     if action in ['add', 'del', 'old']:
         mac = argv[2]
diff --git a/bin/nova-import-canonical-imagestore b/bin/nova-import-canonical-imagestore
index 2bc61cf0c..4ed9e8365 100755
--- a/bin/nova-import-canonical-imagestore
+++ b/bin/nova-import-canonical-imagestore
@@ -29,6 +29,14 @@ import subprocess
 import sys
 import urllib2
 
+# If ../nova/__init__.py exists, add ../ to Python search path, so that
+# it will override what happens to be installed in /usr/(local/)lib/python...
+possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
+                                   os.pardir,
+                                   os.pardir))
+if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
+    sys.path.insert(0, possible_topdir)
+
 from nova import flags
 from nova import utils
 from nova.objectstore import image
diff --git a/bin/nova-instancemonitor b/bin/nova-instancemonitor
index fbac58889..094da4033 100755
--- a/bin/nova-instancemonitor
+++ b/bin/nova-instancemonitor
@@ -21,9 +21,19 @@
   Daemon for Nova RRD based instance resource monitoring.
 """
 
+import os
 import logging
+import sys
 from twisted.application import service
 
+# If ../nova/__init__.py exists, add ../ to Python search path, so that
+# it will override what happens to be installed in /usr/(local/)lib/python...
+possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
+                                   os.pardir,
+                                   os.pardir))
+if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
+    sys.path.insert(0, possible_topdir)
+
 from nova import twistd
 from nova.compute import monitor
 
diff --git a/bin/nova-manage b/bin/nova-manage
index 055f2c3a9..ecef5d555 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -22,9 +22,18 @@
   Connects to the running ADMIN api in the api daemon.
 """
 
+import os
 import sys
 import time
 
+# If ../nova/__init__.py exists, add ../ to Python search path, so that
+# it will override what happens to be installed in /usr/(local/)lib/python...
+possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
+                                   os.pardir,
+                                   os.pardir))
+if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
+    sys.path.insert(0, possible_topdir)
+
 from nova import db
 from nova import flags
 from nova import utils
diff --git a/bin/nova-network b/bin/nova-network
index 040b35e04..fa88aeb47 100755
--- a/bin/nova-network
+++ b/bin/nova-network
@@ -21,6 +21,17 @@
   Twistd daemon for the nova network nodes.
 """
 
+import os
+import sys
+
+# If ../nova/__init__.py exists, add ../ to Python search path, so that
+# it will override what happens to be installed in /usr/(local/)lib/python...
+possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
+                                   os.pardir,
+                                   os.pardir))
+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 twistd
 
diff --git a/bin/nova-objectstore b/bin/nova-objectstore
index 7cb718b6f..728f2ee5b 100755
--- a/bin/nova-objectstore
+++ b/bin/nova-objectstore
@@ -21,6 +21,17 @@
   Twisted daemon for nova objectstore. Supports S3 API.
 """
 
+import os
+import sys
+
+# If ../nova/__init__.py exists, add ../ to Python search path, so that
+# it will override what happens to be installed in /usr/(local/)lib/python...
+possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
+                                   os.pardir,
+                                   os.pardir))
+if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
+    sys.path.insert(0, possible_topdir)
+
 from nova import flags
 from nova import utils
 from nova import twistd
diff --git a/bin/nova-volume b/bin/nova-volume
index fac4b5d01..b9e235717 100755
--- a/bin/nova-volume
+++ b/bin/nova-volume
@@ -21,6 +21,17 @@
   Twistd daemon for the nova volume nodes.
 """
 
+import os
+import sys
+
+# If ../nova/__init__.py exists, add ../ to Python search path, so that
+# it will override what happens to be installed in /usr/(local/)lib/python...
+possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
+                                   os.pardir,
+                                   os.pardir))
+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 twistd