From e2569c1d2da99d1d48f0b5669b841176880a61ac Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Wed, 15 Feb 2012 17:09:20 +0100
Subject: [PATCH] =?UTF-8?q?ConfigWriter:=20Stop=20using=20=E2=80=9Civ=5Fna?=
=?UTF-8?q?me=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: RenΓ© Nussbaumer <rn@google.com>
---
lib/config.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/config.py b/lib/config.py
index 4a5c62108..8c5fda9cb 100644
--- a/lib/config.py
+++ b/lib/config.py
@@ -491,12 +491,12 @@ class ConfigWriter:
cluster.FillBE(instance), constants.BES_PARAMETER_TYPES)
# gather the drbd ports for duplicate checks
- for dsk in instance.disks:
+ for (idx, dsk) in enumerate(instance.disks):
if dsk.dev_type in constants.LDS_DRBD:
tcp_port = dsk.logical_id[2]
if tcp_port not in ports:
ports[tcp_port] = []
- ports[tcp_port].append((instance.name, "drbd disk %s" % dsk.iv_name))
+ ports[tcp_port].append((instance.name, "drbd disk %s" % idx))
# gather network port reservation
net_port = getattr(instance, "network_port", None)
if net_port is not None:
--
GitLab