fixing more network issues

1 files changed, 5 insertions, 5 deletions

diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge
index 266fd70ce..bd8fd9785 100755
--- a/bin/nova-dhcpbridge
+++ b/bin/nova-dhcpbridge
@@ -35,6 +35,7 @@ from nova import rpc
 from nova import utils
 from nova.network import linux_net
 from nova.network import service
+from nova import datastore # for redis_db flag
 
 FLAGS = flags.FLAGS
 
@@ -43,6 +44,8 @@ def add_lease(_mac, ip, _hostname, _interface):
     """Set the IP that was assigned by the DHCP server."""
     if FLAGS.fake_rabbit:
         logging.debug("leasing_ip")
+        print FLAGS.redis_db
+        print FLAGS.sql_connection
         service.VlanNetworkService().lease_ip(ip)
     else:
         rpc.cast("%s.%s" % (FLAGS.network_topic, FLAGS.node_name),
@@ -78,12 +81,8 @@ def main():
     utils.default_flagfile(flagfile)
     argv = FLAGS(sys.argv)
     interface = os.environ.get('DNSMASQ_INTERFACE', 'br0')
-    LOG_FILENAME = 'example.log'
-    logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG)
-    logging.debug("this is a test")
     sqlfile = os.environ.get('SQL_DB', '')
     if int(os.environ.get('TESTING', '0')):
-        logging.debug("fake rabbit is true")
         FLAGS.fake_rabbit = True
         FLAGS.redis_db = 8
         FLAGS.network_size = 16
@@ -91,7 +90,8 @@ def main():
         FLAGS.fake_network = True
         FLAGS.auth_driver = 'nova.auth.ldapdriver.FakeLdapDriver'
         FLAGS.num_networks = 5
-        FLAGS.sql_connection = 'sqlite:///%s' % sqlfile
+        FLAGS.sql_connection = 'mysql://root@localhost/test'
+        #FLAGS.sql_connection = 'sqlite:///%s' % sqlfile
     action = argv[1]
     if action in ['add', 'del', 'old']:
         mac = argv[2]