From 5d25b928066df5f67fd42bac68621d9b51291f8f Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Mon, 28 Jun 2010 14:09:48 +0200
Subject: [PATCH] Remove dead code from cfgupgrade
Three constants were no longer user after commit 11c31f5cb5, which
removed support for upgrading from Ganeti 1.2.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
tools/cfgupgrade | 23 -----------------------
1 file changed, 23 deletions(-)
diff --git a/tools/cfgupgrade b/tools/cfgupgrade
index c45c9ce77..0d7bdc7fe 100755
--- a/tools/cfgupgrade
+++ b/tools/cfgupgrade
@@ -44,29 +44,6 @@ from ganeti import config
options = None
args = None
-# Dictionary with instance old keys, and new hypervisor keys
-INST_HV_CHG = {
- 'hvm_pae': constants.HV_PAE,
- 'vnc_bind_address': constants.HV_VNC_BIND_ADDRESS,
- 'initrd_path': constants.HV_INITRD_PATH,
- 'hvm_nic_type': constants.HV_NIC_TYPE,
- 'kernel_path': constants.HV_KERNEL_PATH,
- 'hvm_acpi': constants.HV_ACPI,
- 'hvm_cdrom_image_path': constants.HV_CDROM_IMAGE_PATH,
- 'hvm_boot_order': constants.HV_BOOT_ORDER,
- 'hvm_disk_type': constants.HV_DISK_TYPE,
- }
-
-# Instance beparams changes
-INST_BE_CHG = {
- 'vcpus': constants.BE_VCPUS,
- 'memory': constants.BE_MEMORY,
- 'auto_balance': constants.BE_AUTO_BALANCE,
- }
-
-# Field names
-F_SERIAL = 'serial_no'
-
class Error(Exception):
"""Generic exception"""
--
GitLab