Commit e79a5873 authored by Klaus Aehlig's avatar Klaus Aehlig

Merge branch 'stable-2.10' into stable-2.11

* stable-2.10
  KVM: fix NIC configuration with absent NIC VLAN
Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
Reviewed-by: default avatarPetr Pudlak <pudlak@google.com>
parents 0c53791a 3089f062
...@@ -1098,7 +1098,7 @@ class KVMHypervisor(hv_base.BaseHypervisor): ...@@ -1098,7 +1098,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
if nic.nicparams[constants.NIC_LINK]: if nic.nicparams[constants.NIC_LINK]:
env["LINK"] = 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] env["VLAN"] = nic.nicparams[constants.NIC_VLAN]
if nic.network: 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