From fc00b24ddd4d2eceb68199b059fb895604ce361d Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Fri, 22 Jul 2011 22:39:08 +0000
Subject: make sure dhcp_server is available in vlan mode

---
 nova/network/manager.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/network/manager.py b/nova/network/manager.py
index 75c3f668d..3c1d58af3 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -893,7 +893,6 @@ class VlanManager(RPCAllocateFixedIP, FloatingIP, NetworkManager):
 
     def _setup_network(self, context, network_ref):
         """Sets up network on this host."""
-        network_ref['dhcp_server'] = self._get_dhcp_ip(context, network_ref)
         if not network_ref['vpn_public_address']:
             net = {}
             address = FLAGS.vpn_ip
@@ -901,6 +900,7 @@ class VlanManager(RPCAllocateFixedIP, FloatingIP, NetworkManager):
             network_ref = db.network_update(context, network_ref['id'], net)
         else:
             address = network_ref['vpn_public_address']
+        network_ref['dhcp_server'] = self._get_dhcp_ip(context, network_ref)
         self.driver.ensure_vlan_bridge(network_ref['vlan'],
                                        network_ref['bridge'],
                                        network_ref['bridge_interface'],
-- 
cgit 


From 0206da24a6d9175b9dd50000fb9d8435355696bd Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Sat, 23 Jul 2011 00:00:04 +0000
Subject: update netutils in libvirt to match the 2 dns setup

---
 nova/virt/libvirt/netutils.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nova/virt/libvirt/netutils.py b/nova/virt/libvirt/netutils.py
index 8d36c0a05..041eacb2d 100644
--- a/nova/virt/libvirt/netutils.py
+++ b/nova/virt/libvirt/netutils.py
@@ -91,9 +91,14 @@ def get_network_info(instance):
             'broadcast': network['broadcast'],
             'mac': vif['address'],
             'rxtx_cap': flavor['rxtx_cap'],
-            'dns': [network['dns']],
+            'dns': [],
             'ips': [ip_dict(ip) for ip in network_ips]}
 
+        if network['dns1']:
+            mapping['dns'].append(network['dns1'])
+        if network['dns2']:
+            mapping['dns'].append(network['dns2'])
+
         if FLAGS.use_ipv6:
             mapping['ip6s'] = [ip6_dict()]
             mapping['gateway6'] = network['gateway_v6']
-- 
cgit