summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authortermie <github@anarkystic.com>2011-05-24 13:19:09 -0700
committertermie <github@anarkystic.com>2011-05-24 13:19:09 -0700
commit6be49381fc1c232e99de3e9774fb6c3e5b685fcf (patch)
treecfb01a9b4135caee416f8a031e5742b2b789d2f3 /bin
parentd8e1f0b6b3ab7a8549773910815b1d2a5d1b8f2f (diff)
make fake_flags set defaults instead of runtime values
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-dhcpbridge7
1 files changed, 7 insertions, 0 deletions
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge
index f42dfd6b5..5926b97de 100755
--- a/bin/nova-dhcpbridge
+++ b/bin/nova-dhcpbridge
@@ -108,6 +108,13 @@ def main():
interface = os.environ.get('DNSMASQ_INTERFACE', FLAGS.dnsmasq_interface)
if int(os.environ.get('TESTING', '0')):
from nova.tests import fake_flags
+
+ #if FLAGS.fake_rabbit:
+ # LOG.debug(_("leasing ip"))
+ # network_manager = utils.import_object(FLAGS.network_manager)
+ ## reload(fake_flags)
+ # from nova.tests import fake_flags
+
action = argv[1]
if action in ['add', 'del', 'old']:
mac = argv[2]