Commit b9471a8f authored by Klaus Aehlig's avatar Klaus Aehlig
Browse files

Merge branch 'stable-2.11' into stable-2.12



* stable-2.11
  (no changes)

* stable-2.10
  KVM: fix NIC configuration with absent NIC VLAN

Conflicts:
	lib/hypervisor/hv_kvm/__init__.py: follow code move
	    to lib/hypervisor/hv_base.py
Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
Reviewed-by: default avatarPetr Pudlak <pudlak@google.com>
parents 6cfc67c5 e79a5873
......@@ -235,7 +235,7 @@ def ConfigureNIC(cmd, instance, seq, nic, tap):
if nic.nicparams[constants.NIC_LINK]:
env["LINK"] = nic.nicparams[constants.NIC_LINK]
if nic.nicparams[constants.NIC_VLAN]:
if constants.NIC_VLAN in nic.nicparams:
env["VLAN"] = nic.nicparams[constants.NIC_VLAN]
if nic.network:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment