commit 9a9c22d356df4586a36f0f54ed801b48c875394c
Merge: ff7d1dc 203a97f
Author: Klaus Aehlig <aeh...@google.com>
Date: Mon Jan 11 12:30:30 2016 +0100
Merge branch 'stable-2.10' into stable-2.11
* stable-2.10
KVM: explicitly configure routed NICs late
Signed-off-by: Klaus Aehlig <aeh...@google.com>
diff --cc lib/hypervisor/hv_kvm.py
index 5bac537,47eaa48..5bab1f2
--- a/lib/hypervisor/hv_kvm.py
+++ b/lib/hypervisor/hv_kvm.py
@@@ -1965,15 -1934,13 +1965,16 @@@ class KVMHypervisor(hv_base.BaseHypervi
logging.debug("Enabling QMP")
kvm_cmd.extend(["-qmp", "unix:%s,server,nowait" %
self._InstanceQmpMonitor(instance.name)])
+ # Add a second monitor for kvmd
+ kvm_cmd.extend(["-qmp", "unix:%s,server,nowait" %
+ self._InstanceKvmdMonitor(instance.name)])
- # Configure the network now for starting instances and bridged interfaces,
- # during FinalizeMigration for incoming instances' routed interfaces
+ # Configure the network now for starting instances and bridged/OVS
+ # interfaces, during FinalizeMigration for incoming instances' routed
+ # interfaces.
for nic_seq, nic in enumerate(kvm_nics):
if (incoming and
- nic.nicparams[constants.NIC_MODE] != constants.NIC_MODE_BRIDGED):
+ nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_ROUTED):
continue
self._ConfigureNIC(instance, nic_seq, nic, taps[nic_seq])
--
Klaus Aehlig
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Matthew Scott Sucherman, Paul Terence Manicle
