diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-13 05:01:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-13 05:01:33 +0000 |
| commit | 1756ec29fa5d81aa6e3de90b2612093460deecaa (patch) | |
| tree | 5068efbd3ee7943caf67ffa22356219c0cede1c8 | |
| parent | 783bac69fd012263473195e0a3dcde77177c521d (diff) | |
| parent | f1640fec0e54a4336ef9086cb74c1ca93eac4781 (diff) | |
Merge "Let VlanManager keep network's DNS settings."
| -rw-r--r-- | nova/network/manager.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index d032fe159..cf7b6109d 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -1632,8 +1632,6 @@ class NetworkManager(manager.SchedulerDependentManager): if kwargs.get('vpn', False): # this bit here is for vlan-manager - del net['dns1'] - del net['dns2'] vlan = kwargs['vlan_start'] + index net['vpn_private_address'] = str(subnet_v4[2]) net['dhcp_start'] = str(subnet_v4[3]) |