From 4d2a7c952a307b4742243fa38dba52db0a565f84 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Wed, 13 May 2009 11:33:57 +0100
Subject: [PATCH] Remove the HTS_COPY_VNC_PASSWORD constant/feature
Currently just for xen-hvm we copy the vnc password on node-add. This
will be changed for 2.1 with a more advanced gnt-cluster redist-conf
functionality which is going to be used by node-add as well.
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/cmdlib.py | 10 ----------
lib/constants.py | 1 -
2 files changed, 11 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index e2aec21b8..7c25d9555 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -2264,16 +2264,6 @@ class LUAddNode(LogicalUnit):
if to_result.failed or not to_result.data:
logging.error("Copy of file %s to node %s failed", fname, to_node)
- to_copy = []
- enabled_hypervisors = self.cfg.GetClusterInfo().enabled_hypervisors
- if constants.HTS_COPY_VNC_PASSWORD.intersection(enabled_hypervisors):
- to_copy.append(constants.VNC_PASSWORD_FILE)
-
- for fname in to_copy:
- result = self.rpc.call_upload_file([node], fname)
- if result[node].failed or not result[node]:
- logging.error("Could not copy file %s to node %s", fname, node)
-
if self.op.readd:
self.context.ReaddNode(new_node)
else:
diff --git a/lib/constants.py b/lib/constants.py
index 0bcf70a8a..1182cdf1c 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -353,7 +353,6 @@ HT_XEN_HVM = "xen-hvm"
HT_KVM = "kvm"
HYPER_TYPES = frozenset([HT_XEN_PVM, HT_FAKE, HT_XEN_HVM, HT_KVM])
HTS_REQ_PORT = frozenset([HT_XEN_HVM, HT_KVM])
-HTS_COPY_VNC_PASSWORD = frozenset([HT_XEN_HVM])
VNC_BASE_PORT = 5900
VNC_PASSWORD_FILE = _autoconf.SYSCONFDIR + "/ganeti/vnc-cluster-password"
--
GitLab