Revision bfe86c76 lib/constants.py

b/lib/constants.py
139 139
NODED_CERT_FILE = DATA_DIR + "/server.pem"
140 140
RAPI_CERT_FILE = DATA_DIR + "/rapi.pem"
141 141
CONFD_HMAC_KEY = DATA_DIR + "/hmac.key"
142
SPICE_CERT_FILE = DATA_DIR + "/spice.pem"
143
SPICE_CACERT_FILE = DATA_DIR + "/spice-ca.pem"
142 144
CLUSTER_DOMAIN_SECRET_FILE = DATA_DIR + "/cluster-domain-secret"
143 145
INSTANCE_STATUS_FILE = RUN_GANETI_DIR + "/instance-status"
144 146
SSH_KNOWN_HOSTS_FILE = DATA_DIR + "/known_hosts"
......
172 174
#: File containing Unix timestamp until which watcher should be paused
173 175
WATCHER_PAUSEFILE = DATA_DIR + "/watcher.pause"
174 176

  
175
ALL_CERT_FILES = frozenset([NODED_CERT_FILE, RAPI_CERT_FILE])
177
ALL_CERT_FILES = frozenset([
178
  NODED_CERT_FILE,
179
  RAPI_CERT_FILE,
180
  SPICE_CERT_FILE,
181
  SPICE_CACERT_FILE,
182
  ])
176 183

  
177 184
MASTER_SOCKET = SOCKET_DIR + "/ganeti-master"
178 185

  
......
679 686
HV_KVM_SPICE_ZLIB_GLZ_IMG_COMPR = "spice_zlib_glz_wan_compression"
680 687
HV_KVM_SPICE_STREAMING_VIDEO_DETECTION = "spice_streaming_video"
681 688
HV_KVM_SPICE_AUDIO_COMPR = "spice_playback_compression"
689
HV_KVM_SPICE_USE_TLS = "spice_use_tls"
682 690
HV_ACPI = "acpi"
683 691
HV_PAE = "pae"
684 692
HV_USE_BOOTLOADER = "use_bootloader"
......
730 738
  HV_KVM_SPICE_ZLIB_GLZ_IMG_COMPR: VTYPE_STRING,
731 739
  HV_KVM_SPICE_STREAMING_VIDEO_DETECTION: VTYPE_STRING,
732 740
  HV_KVM_SPICE_AUDIO_COMPR: VTYPE_BOOL,
741
  HV_KVM_SPICE_USE_TLS: VTYPE_BOOL,
733 742
  HV_ACPI: VTYPE_BOOL,
734 743
  HV_PAE: VTYPE_BOOL,
735 744
  HV_USE_BOOTLOADER: VTYPE_BOOL,
......
1355 1364
    HV_KVM_SPICE_ZLIB_GLZ_IMG_COMPR: "",
1356 1365
    HV_KVM_SPICE_STREAMING_VIDEO_DETECTION: "",
1357 1366
    HV_KVM_SPICE_AUDIO_COMPR: True,
1367
    HV_KVM_SPICE_USE_TLS: False,
1358 1368
    HV_KVM_FLOPPY_IMAGE_PATH: "",
1359 1369
    HV_CDROM_IMAGE_PATH: "",
1360 1370
    HV_KVM_CDROM2_IMAGE_PATH: "",

Also available in: Unified diff