Revision 4d2a7c95
| b/lib/cmdlib.py | ||
|---|---|---|
| 2264 | 2264 |
if to_result.failed or not to_result.data: |
| 2265 | 2265 |
logging.error("Copy of file %s to node %s failed", fname, to_node)
|
| 2266 | 2266 |
|
| 2267 |
to_copy = [] |
|
| 2268 |
enabled_hypervisors = self.cfg.GetClusterInfo().enabled_hypervisors |
|
| 2269 |
if constants.HTS_COPY_VNC_PASSWORD.intersection(enabled_hypervisors): |
|
| 2270 |
to_copy.append(constants.VNC_PASSWORD_FILE) |
|
| 2271 |
|
|
| 2272 |
for fname in to_copy: |
|
| 2273 |
result = self.rpc.call_upload_file([node], fname) |
|
| 2274 |
if result[node].failed or not result[node]: |
|
| 2275 |
logging.error("Could not copy file %s to node %s", fname, node)
|
|
| 2276 |
|
|
| 2277 | 2267 |
if self.op.readd: |
| 2278 | 2268 |
self.context.ReaddNode(new_node) |
| 2279 | 2269 |
else: |
| b/lib/constants.py | ||
|---|---|---|
| 353 | 353 |
HT_KVM = "kvm" |
| 354 | 354 |
HYPER_TYPES = frozenset([HT_XEN_PVM, HT_FAKE, HT_XEN_HVM, HT_KVM]) |
| 355 | 355 |
HTS_REQ_PORT = frozenset([HT_XEN_HVM, HT_KVM]) |
| 356 |
HTS_COPY_VNC_PASSWORD = frozenset([HT_XEN_HVM]) |
|
| 357 | 356 |
|
| 358 | 357 |
VNC_BASE_PORT = 5900 |
| 359 | 358 |
VNC_PASSWORD_FILE = _autoconf.SYSCONFDIR + "/ganeti/vnc-cluster-password" |
Also available in: Unified diff