From ef756965e5ebd01f36c3fa25601f67c1f7c01a59 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Fri, 15 Feb 2008 09:53:11 +0000
Subject: [PATCH] Further fixes for the 'export MAC in hooks' change
QA suite which tests gnt-instance modify has uncovered another issue related to
mac export.
Reviewed-by: imsnah
---
lib/cmdlib.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 968a97c6c..4bb16f32a 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -4131,7 +4131,7 @@ class LUSetInstanceParms(LogicalUnit):
args['memory'] = self.mem
if self.vcpus:
args['vcpus'] = self.vcpus
- if self.do_ip or self.do_bridge:
+ if self.do_ip or self.do_bridge or self.mac:
if self.do_ip:
ip = self.ip
else:
@@ -4140,7 +4140,11 @@ class LUSetInstanceParms(LogicalUnit):
bridge = self.bridge
else:
bridge = self.instance.nics[0].bridge
- args['nics'] = [(ip, bridge)]
+ if self.mac:
+ mac = self.mac
+ else:
+ mac = self.instance.nics[0].mac
+ args['nics'] = [(ip, bridge, mac)]
env = _BuildInstanceHookEnvByObject(self.instance, override=args)
nl = [self.sstore.GetMasterNode(),
self.instance.primary_node] + list(self.instance.secondary_nodes)
--
GitLab