Revision 9849cec7 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"
144 142
CLUSTER_DOMAIN_SECRET_FILE = DATA_DIR + "/cluster-domain-secret"
145 143
INSTANCE_STATUS_FILE = RUN_GANETI_DIR + "/instance-status"
146 144
SSH_KNOWN_HOSTS_FILE = DATA_DIR + "/known_hosts"
......
174 172
#: File containing Unix timestamp until which watcher should be paused
175 173
WATCHER_PAUSEFILE = DATA_DIR + "/watcher.pause"
176 174

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

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

  
......
687 680
HV_KVM_SPICE_ZLIB_GLZ_IMG_COMPR = "spice_zlib_glz_wan_compression"
688 681
HV_KVM_SPICE_STREAMING_VIDEO_DETECTION = "spice_streaming_video"
689 682
HV_KVM_SPICE_AUDIO_COMPR = "spice_playback_compression"
690
HV_KVM_SPICE_USE_TLS = "spice_use_tls"
691 683
HV_ACPI = "acpi"
692 684
HV_PAE = "pae"
693 685
HV_USE_BOOTLOADER = "use_bootloader"
......
739 731
  HV_KVM_SPICE_ZLIB_GLZ_IMG_COMPR: VTYPE_STRING,
740 732
  HV_KVM_SPICE_STREAMING_VIDEO_DETECTION: VTYPE_STRING,
741 733
  HV_KVM_SPICE_AUDIO_COMPR: VTYPE_BOOL,
742
  HV_KVM_SPICE_USE_TLS: VTYPE_BOOL,
743 734
  HV_ACPI: VTYPE_BOOL,
744 735
  HV_PAE: VTYPE_BOOL,
745 736
  HV_USE_BOOTLOADER: VTYPE_BOOL,
......
1368 1359
    HV_KVM_SPICE_ZLIB_GLZ_IMG_COMPR: "",
1369 1360
    HV_KVM_SPICE_STREAMING_VIDEO_DETECTION: "",
1370 1361
    HV_KVM_SPICE_AUDIO_COMPR: True,
1371
    HV_KVM_SPICE_USE_TLS: False,
1372 1362
    HV_KVM_FLOPPY_IMAGE_PATH: "",
1373 1363
    HV_CDROM_IMAGE_PATH: "",
1374 1364
    HV_KVM_CDROM2_IMAGE_PATH: "",

Also available in: Unified diff