OpenStack Compute (nova)

Merge lp:~soren/nova/no-vpn-clients-by-default into lp:~hudson-openstack/nova/trunk

  1. no-vpn-clients-by-default
  2. Merge into trunk
Proposed by Soren Hansen
Status: Merged
Approved by: Devin Carlen
Approved revision: 605
Merged at revision: 609
Proposed branch: lp:~soren/nova/no-vpn-clients-by-default
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
nova/network/manager.py (+1/-1)
To merge this branch: bzr merge lp:~soren/nova/no-vpn-clients-by-default
Reviewer Review Type Date Requested Status
Thierry Carrez (community) ffe Approve
Devin Carlen (community) Approve
Jay Pipes (community) Approve
Review via email: mp+47386@code.launchpad.net

Commit message

Set the default number of IP's to to reserve for VPN to 0.

Description of the change

Stop reserving 5 ip's for VPN clients. It seems only few know of its existence, and even fewer are using it, so reserving IP's for it seems silly.

To post a comment you must log in.
Revision history for this message
Soren Hansen (soren) wrote :

This allows subnets as small as /29 to be used for Nova. Not all of us are blessed with a /8 :)

Revision history for this message
Jay Pipes (jaypipes) wrote :

lgtm. always thought having a set number of VPN client IP reservations was very implementation-specific, anyway.

review: Approve
Revision history for this message
Devin Carlen (devcamcar) wrote :

lgtm

review: Approve
Revision history for this message
Thierry Carrez (ttx) wrote :

That should have needed an Ffe (change in default behavior), but as long as Vish is OK with it, I retrospectively grant it :)

review: Approve (ffe)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/network/manager.py'
2--- nova/network/manager.py 2011-01-21 21:10:26 +0000
3+++ nova/network/manager.py 2011-01-25 12:31:16 +0000
4@@ -83,7 +83,7 @@
5 'Floating IP address block')
6 flags.DEFINE_string('fixed_range', '10.0.0.0/8', 'Fixed IP address block')
7 flags.DEFINE_string('fixed_range_v6', 'fd00::/48', 'Fixed IPv6 address block')
8-flags.DEFINE_integer('cnt_vpn_clients', 5,
9+flags.DEFINE_integer('cnt_vpn_clients', 0,
10 'Number of addresses reserved for vpn clients')
11 flags.DEFINE_string('network_driver', 'nova.network.linux_net',
12 'Driver to use for network creation')