Revision 377d74c9

b/lib/constants.py
333 333
HTS_REQ_PORT = frozenset([HT_XEN_HVM, HT_KVM])
334 334
HTS_USE_VNC = frozenset([HT_XEN_HVM, HT_KVM])
335 335

  
336
HT_HVM_VNC_BASE_PORT = 5900
336
VNC_BASE_PORT = 5900
337 337
VNC_PASSWORD_FILE = _autoconf.SYSCONFDIR + "/ganeti/vnc-cluster-password"
338 338
VNC_DEFAULT_BIND_ADDRESS = '0.0.0.0'
339 339

  
b/lib/hypervisor/hv_kvm.py
280 280
    if vnc_bind_address:
281 281
      kvm_cmd.extend(['-usbdevice', 'tablet'])
282 282
      if utils.IsValidIP(vnc_bind_address):
283
        if instance.network_port > constants.HT_HVM_VNC_BASE_PORT:
284
          display = instance.network_port - constants.HT_HVM_VNC_BASE_PORT
283
        if instance.network_port > constants.VNC_BASE_PORT:
284
          display = instance.network_port - constants.VNC_BASE_PORT
285 285
          if vnc_bind_address == '0.0.0.0':
286 286
            vnc_arg = ':%d' % (display)
287 287
          else:
......
290 290
          logging.error("Network port is not a valid VNC display (%d < %d)."
291 291
                        " Not starting VNC" %
292 292
                        (instance.network_port,
293
                         constants.HT_HVM_VNC_BASE_PORT))
293
                         constants.VNC_BASE_PORT))
294 294
          vnc_arg = 'none'
295 295

  
296 296
        # Only allow tls and other option when not binding to a file, for now.
......
666 666

  
667 667
    vnc_bind_address = hvparams[constants.HV_VNC_BIND_ADDRESS]
668 668
    if vnc_bind_address:
669
      if instance.network_port > constants.HT_HVM_VNC_BASE_PORT:
670
        display = instance.network_port - constants.HT_HVM_VNC_BASE_PORT
669
      if instance.network_port > constants.VNC_BASE_PORT:
670
        display = instance.network_port - constants.VNC_BASE_PORT
671 671
        vnc_command = ("echo 'Instance has VNC listening on %s:%d"
672 672
                       " (display: %d)'" % (vnc_bind_address,
673 673
                                            instance.network_port,
b/lib/hypervisor/hv_xen.py
593 593
      config.write("vnclisten = '%s'\n" %
594 594
                   instance.hvparams["vnc_bind_address"])
595 595

  
596
    if instance.network_port > constants.HT_HVM_VNC_BASE_PORT:
597
      display = instance.network_port - constants.HT_HVM_VNC_BASE_PORT
596
    if instance.network_port > constants.VNC_BASE_PORT:
597
      display = instance.network_port - constants.VNC_BASE_PORT
598 598
      config.write("vncdisplay = %s\n" % display)
599 599
      config.write("vncunused = 0\n")
600 600
    else:

Also available in: Unified diff