diff options
| author | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-08-23 22:35:46 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-08-23 22:35:46 -0700 |
| commit | a2cb9dee1d041bb60b3e61cb4b94308ff200fe7e (patch) | |
| tree | 8ba4092d75f47cf130f0b20f2e729f22d0bc5e90 | |
| parent | 625cff41325cef39bb69b960ce993c15943431cb (diff) | |
| download | nova-a2cb9dee1d041bb60b3e61cb4b94308ff200fe7e.tar.gz nova-a2cb9dee1d041bb60b3e61cb4b94308ff200fe7e.tar.xz nova-a2cb9dee1d041bb60b3e61cb4b94308ff200fe7e.zip | |
removed old imports and moved flags
| -rw-r--r-- | nova/db/api.py | 14 | ||||
| -rw-r--r-- | nova/network/service.py | 15 |
2 files changed, 14 insertions, 15 deletions
diff --git a/nova/db/api.py b/nova/db/api.py index 9b3169bd6..996592088 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -25,6 +25,20 @@ FLAGS = flags.FLAGS flags.DEFINE_string('db_backend', 'sqlalchemy', 'The backend to use for db') +# TODO(vish): where should these flags go +flags.DEFINE_integer('vlan_start', 100, 'First VLAN for private networks') +flags.DEFINE_integer('num_networks', 1000, 'Number of networks to support') +flags.DEFINE_string('vpn_ip', utils.get_my_ip(), + 'Public IP for the cloudpipe VPN servers') +flags.DEFINE_integer('vpn_start', 1000, 'First Vpn port for private networks') +flags.DEFINE_integer('network_size', 256, + 'Number of addresses in each private subnet') +flags.DEFINE_string('public_range', '4.4.4.0/24', 'Public IP address block') +flags.DEFINE_string('private_range', '10.0.0.0/8', 'Private IP address block') +flags.DEFINE_integer('cnt_vpn_clients', 5, + 'Number of addresses reserved for vpn clients') + + _impl = utils.LazyPluggable(FLAGS['db_backend'], sqlalchemy='nova.db.sqlalchemy.api') diff --git a/nova/network/service.py b/nova/network/service.py index 4f8751a6f..609cd6be3 100644 --- a/nova/network/service.py +++ b/nova/network/service.py @@ -21,9 +21,6 @@ Network Hosts are responsible for allocating ips and setting up network """ import logging -import math - -import IPy from nova import db from nova import exception @@ -53,18 +50,6 @@ flags.DEFINE_string('flat_network_broadcast', '192.168.0.255', flags.DEFINE_string('flat_network_dns', '8.8.4.4', 'Dns for simple network') -flags.DEFINE_integer('vlan_start', 100, 'First VLAN for private networks') -flags.DEFINE_integer('num_networks', 1000, 'Number of networks to support') -flags.DEFINE_string('vpn_ip', utils.get_my_ip(), - 'Public IP for the cloudpipe VPN servers') -flags.DEFINE_integer('vpn_start', 1000, 'First Vpn port for private networks') -flags.DEFINE_integer('network_size', 256, - 'Number of addresses in each private subnet') -flags.DEFINE_string('public_range', '4.4.4.0/24', 'Public IP address block') -flags.DEFINE_string('private_range', '10.0.0.0/8', 'Private IP address block') -flags.DEFINE_integer('cnt_vpn_clients', 5, - 'Number of addresses reserved for vpn clients') - class AddressAlreadyAllocated(exception.Error): pass |