Merge branch 'stable-2.10' into stable-2.11 stable-2.11
authorKlaus Aehlig <aehlig@google.com>
Mon, 11 Jan 2016 11:30:30 +0000 (12:30 +0100)
committerKlaus Aehlig <aehlig@google.com>
Mon, 11 Jan 2016 11:51:51 +0000 (12:51 +0100)
* stable-2.10
  KVM: explicitly configure routed NICs late

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Lisa Velden <velden@google.com>

1  2 
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])