diff options
| author | Rick Harris <rick.harris@rackspace.com> | 2011-02-25 16:47:08 +0000 |
|---|---|---|
| committer | Rick Harris <rick.harris@rackspace.com> | 2011-02-25 16:47:08 +0000 |
| commit | 7ae64e06643025e4945ae0ef056f9fb2184904ff (patch) | |
| tree | 467ff2123559b9ce06ed1c343bd9ec12cce2c16b /bin | |
| parent | 079b532a1080da9fe5d99e90fa9c60d16506de06 (diff) | |
| parent | 645bc7a7dea6ba01d76589632200636e243641ec (diff) | |
| download | nova-7ae64e06643025e4945ae0ef056f9fb2184904ff.tar.gz nova-7ae64e06643025e4945ae0ef056f9fb2184904ff.tar.xz nova-7ae64e06643025e4945ae0ef056f9fb2184904ff.zip | |
Merging trunk, conflicts fixed
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-dhcpbridge | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge index 04a1771f0..3dd9de367 100755 --- a/bin/nova-dhcpbridge +++ b/bin/nova-dhcpbridge @@ -105,18 +105,7 @@ def main(): logging.setup() interface = os.environ.get('DNSMASQ_INTERFACE', 'br0') if int(os.environ.get('TESTING', '0')): - FLAGS.fake_rabbit = True - FLAGS.network_size = 16 - FLAGS.connection_type = 'fake' - FLAGS.fake_network = True - FLAGS.auth_driver = 'nova.auth.dbdriver.DbDriver' - FLAGS.num_networks = 5 - path = os.path.abspath(os.path.join(os.path.dirname(__file__), - '..', - 'nova', - 'tests', - 'tests.sqlite')) - FLAGS.sql_connection = 'sqlite:///%s' % path + from nova.tests import fake_flags action = argv[1] if action in ['add', 'del', 'old']: mac = argv[2] |