diff options
| author | Josh Kleinpeter <josh@kleinpeter.org> | 2011-03-21 17:51:27 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-03-21 17:51:27 +0000 |
| commit | 5562c3f4b0a8e344cfd37dde19df7cb8d9fd03b2 (patch) | |
| tree | c92a285ad7ef5e0769307a77ed0211b4d3fad7c5 | |
| parent | cf84d5bc465823f9342a0a300176a3cf96fbb925 (diff) | |
| parent | 3754a7b6f4cf0e9c60a140348b4cdb9c8acde062 (diff) | |
| download | nova-5562c3f4b0a8e344cfd37dde19df7cb8d9fd03b2.tar.gz nova-5562c3f4b0a8e344cfd37dde19df7cb8d9fd03b2.tar.xz nova-5562c3f4b0a8e344cfd37dde19df7cb8d9fd03b2.zip | |
Changed fixed_range (CIDR) to be required in the nova-manage command; changed default num_networks to 1.
| -rw-r--r-- | Authors | 1 | ||||
| -rwxr-xr-x | bin/nova-manage | 5 | ||||
| -rw-r--r-- | nova/network/manager.py | 2 |
3 files changed, 5 insertions, 3 deletions
@@ -33,6 +33,7 @@ Jonathan Bryce <jbryce@jbryce.com> Jordan Rinke <jordan@openstack.org> Josh Durgin <joshd@hq.newdream.net> Josh Kearney <josh@jk0.org> +Josh Kleinpeter <josh@kleinpeter.org> Joshua McKenty <jmckenty@gmail.com> Justin Santa Barbara <justin@fathomdb.com> Kei Masumoto <masumotok@nttdata.co.jp> diff --git a/bin/nova-manage b/bin/nova-manage index 013a6077b..69cbf6f95 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -518,11 +518,12 @@ class NetworkCommands(object): network_size=None, vlan_start=None, vpn_start=None, fixed_range_v6=None, label='public'): """Creates fixed ips for host by range - arguments: [fixed_range=FLAG], [num_networks=FLAG], + arguments: fixed_range=FLAG, [num_networks=FLAG], [network_size=FLAG], [vlan_start=FLAG], [vpn_start=FLAG], [fixed_range_v6=FLAG]""" if not fixed_range: - fixed_range = FLAGS.fixed_range + raise TypeError(_('Fixed range in the form of 10.0.0.0/8 is ' + 'required to create networks.')) if not num_networks: num_networks = FLAGS.num_networks if not network_size: diff --git a/nova/network/manager.py b/nova/network/manager.py index 0decb126a..91519a2ab 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -73,7 +73,7 @@ flags.DEFINE_string('flat_interface', None, flags.DEFINE_string('flat_network_dhcp_start', '10.0.0.2', 'Dhcp start for FlatDhcp') flags.DEFINE_integer('vlan_start', 100, 'First VLAN for private networks') -flags.DEFINE_integer('num_networks', 1000, 'Number of networks to support') +flags.DEFINE_integer('num_networks', 1, 'Number of networks to support') flags.DEFINE_string('vpn_ip', '$my_ip', 'Public IP for the cloudpipe VPN servers') flags.DEFINE_integer('vpn_start', 1000, 'First Vpn port for private networks') |