Revision b3cc1646 tools/cfgupgrade
b/tools/cfgupgrade | ||
---|---|---|
150 | 150 |
ial_params = cluster.get("default_iallocator_params", None) |
151 | 151 |
if not ial_params: |
152 | 152 |
cluster["default_iallocator_params"] = {} |
153 |
if not "candidate_certs" in cluster: |
|
154 |
cluster["candidate_certs"] = {} |
|
153 | 155 |
|
154 | 156 |
|
155 | 157 |
def UpgradeGroups(config_data): |
... | ... | |
407 | 409 |
DowngradeNdparams(cluster) |
408 | 410 |
if "default_iallocator_params" in cluster: |
409 | 411 |
del cluster["default_iallocator_params"] |
412 |
if "candidate_certs" in cluster: |
|
413 |
del cluster["candidate_certs"] |
|
410 | 414 |
|
411 | 415 |
|
412 | 416 |
def DowngradeGroups(config_data): |
... | ... | |
469 | 473 |
options.data_dir = os.path.abspath(options.data_dir) |
470 | 474 |
options.CONFIG_DATA_PATH = options.data_dir + "/config.data" |
471 | 475 |
options.SERVER_PEM_PATH = options.data_dir + "/server.pem" |
476 |
options.CLIENT_PEM_PATH = options.data_dir + "/client.pem" |
|
472 | 477 |
options.KNOWN_HOSTS_PATH = options.data_dir + "/known_hosts" |
473 | 478 |
options.RAPI_CERT_FILE = options.data_dir + "/rapi.pem" |
474 | 479 |
options.SPICE_CERT_FILE = options.data_dir + "/spice.pem" |
... | ... | |
571 | 576 |
backup=True) |
572 | 577 |
|
573 | 578 |
if not options.dry_run: |
574 |
# FIXME: fix node client certificate |
|
575 | 579 |
bootstrap.GenerateClusterCrypto( |
576 |
False, False, False, False, False, False,
|
|
580 |
False, False, False, False, False, |
|
577 | 581 |
nodecert_file=options.SERVER_PEM_PATH, |
578 | 582 |
rapicert_file=options.RAPI_CERT_FILE, |
579 | 583 |
spicecert_file=options.SPICE_CERT_FILE, |
Also available in: Unified diff