diff options
| author | Yuriy Taraday <yorik.sar@gmail.com> | 2012-10-25 15:16:36 +0400 |
|---|---|---|
| committer | Yuriy Taraday <yorik.sar@gmail.com> | 2012-10-25 15:16:57 +0400 |
| commit | f1640fec0e54a4336ef9086cb74c1ca93eac4781 (patch) | |
| tree | eb2b0e5043e56b34b898f5df4b47469cb6af70eb /nova | |
| parent | e6710a0193bf36812ec7bd65c757020a96bfe7f9 (diff) | |
Let VlanManager keep network's DNS settings.
Lost piece of https://review.openstack.org/14560
Change-Id: I0376767f66041e2647fc2319ab3b2a339cdf7a19
Diffstat (limited to 'nova')
| -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 06380a97f..390fa9964 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -1597,8 +1597,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]) |