From f1640fec0e54a4336ef9086cb74c1ca93eac4781 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Thu, 25 Oct 2012 15:16:36 +0400
Subject: Let VlanManager keep network's DNS settings.

Lost piece of https://review.openstack.org/14560

Change-Id: I0376767f66041e2647fc2319ab3b2a339cdf7a19
---
 nova/network/manager.py | 2 --
 1 file changed, 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])
-- 
cgit