Revision b6267745 tools/cfgupgrade

b/tools/cfgupgrade
122 122
  options.SERVER_PEM_PATH = options.data_dir + "/server.pem"
123 123
  options.KNOWN_HOSTS_PATH = options.data_dir + "/known_hosts"
124 124
  options.RAPI_CERT_FILE = options.data_dir + "/rapi.pem"
125
  options.SPICE_CERT_FILE = options.data_dir + "/spice.pem"
126
  options.SPICE_CACERT_FILE = options.data_dir + "/spice-ca.pem"
125 127
  options.RAPI_USERS_FILE = options.data_dir + "/rapi/users"
126 128
  options.RAPI_USERS_FILE_PRE24 = options.data_dir + "/rapi_users"
127 129
  options.CONFD_HMAC_KEY = options.data_dir + "/hmac.key"
......
222 224
                    backup=True)
223 225

  
224 226
    if not options.dry_run:
225
      bootstrap.GenerateClusterCrypto(False, False, False, False,
226
                                      nodecert_file=options.SERVER_PEM_PATH,
227
                                      rapicert_file=options.RAPI_CERT_FILE,
228
                                      hmackey_file=options.CONFD_HMAC_KEY,
229
                                      cds_file=options.CDS_FILE)
227
      bootstrap.GenerateClusterCrypto(False, False, False, False, False,
228
                                     nodecert_file=options.SERVER_PEM_PATH,
229
                                     rapicert_file=options.RAPI_CERT_FILE,
230
                                     spicecert_file=options.SPICE_CERT_FILE,
231
                                     spicecacert_file=options.SPICE_CACERT_FILE,
232
                                     hmackey_file=options.CONFD_HMAC_KEY,
233
                                     cds_file=options.CDS_FILE)
230 234

  
231 235
  except Exception:
232 236
    logging.critical("Writing configuration failed. It is probably in an"

Also available in: Unified diff