From 0183a6975ed1141a1151917a5f461600f4647425 Mon Sep 17 00:00:00 2001
From: Alessandro Cincaglini <alessandro.ciancaglini@gmail.com>
Date: Fri, 29 Jan 2010 11:47:45 +0000
Subject: [PATCH] Fix missing bridge for xen instances
Xen instances nic definitions miss the target bridge.
This bug was introduced in commit 503b97a9.
Signed-off-by: Alessandro Cincaglini <alessandro.ciancaglini@gmail.com>
Reviewed-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
Signed-off-by: Guido Trotter <ultrotter@google.com>
---
lib/hypervisor/hv_xen.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/hypervisor/hv_xen.py b/lib/hypervisor/hv_xen.py
index 2eb2cc5ad..f73557a02 100644
--- a/lib/hypervisor/hv_xen.py
+++ b/lib/hypervisor/hv_xen.py
@@ -496,9 +496,9 @@ class XenPvmHypervisor(XenHypervisor):
ip = getattr(nic, "ip", None)
if ip is not None:
nic_str += ", ip=%s" % ip
- vif_data.append("'%s'" % nic_str)
if nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_BRIDGED:
nic_str += ", bridge=%s" % nic.nicparams[constants.NIC_LINK]
+ vif_data.append("'%s'" % nic_str)
disk_data = cls._GetConfigFileDiskData(block_devices)
@@ -624,9 +624,9 @@ class XenHvmHypervisor(XenHypervisor):
ip = getattr(nic, "ip", None)
if ip is not None:
nic_str += ", ip=%s" % ip
- vif_data.append("'%s'" % nic_str)
if nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_BRIDGED:
nic_str += ", bridge=%s" % nic.nicparams[constants.NIC_LINK]
+ vif_data.append("'%s'" % nic_str)
config.write("vif = [%s]\n" % ",".join(vif_data))
disk_data = cls._GetConfigFileDiskData(block_devices)
--
GitLab