Revision 06073e85
b/lib/cli.py | ||
---|---|---|
62 | 62 |
"FIELDS_OPT", |
63 | 63 |
"FILESTORE_DIR_OPT", |
64 | 64 |
"FILESTORE_DRIVER_OPT", |
65 |
"FORCE_OPT", |
|
66 |
"FORCE_VARIANT_OPT", |
|
65 | 67 |
"GLOBAL_FILEDIR_OPT", |
66 | 68 |
"HVLIST_OPT", |
67 | 69 |
"HVOPTS_OPT", |
... | ... | |
71 | 73 |
"IGNORE_FAILURES_OPT", |
72 | 74 |
"IGNORE_SECONDARIES_OPT", |
73 | 75 |
"IGNORE_SIZE_OPT", |
74 |
"FORCE_OPT", |
|
75 | 76 |
"MAC_PREFIX_OPT", |
76 | 77 |
"MASTER_NETDEV_OPT", |
77 | 78 |
"MC_OPT", |
... | ... | |
567 | 568 |
metavar="<os>", |
568 | 569 |
completion_suggest=OPT_COMPL_ONE_OS) |
569 | 570 |
|
571 |
FORCE_VARIANT_OPT = cli_option("--force-variant", dest="force_variant", |
|
572 |
action="store_true", default=False, |
|
573 |
help="Force an unknown variant") |
|
574 |
|
|
570 | 575 |
BACKEND_OPT = cli_option("-B", "--backend-parameters", dest="beparams", |
571 | 576 |
type="keyval", default={}, |
572 | 577 |
help="Backend parameters") |
b/scripts/gnt-instance | ||
---|---|---|
440 | 440 |
disk_template=specs['template'], |
441 | 441 |
mode=constants.INSTANCE_CREATE, |
442 | 442 |
os_type=specs['os'], |
443 |
force_variant=opts.force_variant, |
|
443 | 444 |
pnode=specs['primary_node'], |
444 | 445 |
snode=specs['secondary_node'], |
445 | 446 |
nics=tmp_nics, |
... | ... | |
529 | 530 |
jex = JobExecutor(verbose=multi_on) |
530 | 531 |
for instance_name in inames: |
531 | 532 |
op = opcodes.OpReinstallInstance(instance_name=instance_name, |
532 |
os_type=os_name) |
|
533 |
os_type=os_name, |
|
534 |
force_variant=opts.force_variant) |
|
533 | 535 |
jex.QueueJob(instance_name, op) |
534 | 536 |
|
535 | 537 |
jex.WaitOrShow(not opts.submit_only) |
... | ... | |
1266 | 1268 |
NOSTART_OPT, |
1267 | 1269 |
NWSYNC_OPT, |
1268 | 1270 |
OS_OPT, |
1271 |
FORCE_VARIANT_OPT, |
|
1269 | 1272 |
OS_SIZE_OPT, |
1270 | 1273 |
SUBMIT_OPT, |
1271 | 1274 |
] |
... | ... | |
1317 | 1320 |
), |
1318 | 1321 |
'reinstall': ( |
1319 | 1322 |
ReinstallInstance, [ArgInstance()], |
1320 |
[FORCE_OPT, OS_OPT, m_force_multi, m_node_opt, m_pri_node_opt, |
|
1321 |
m_sec_node_opt, m_clust_opt, m_inst_opt, SELECT_OS_OPT, SUBMIT_OPT], |
|
1323 |
[FORCE_OPT, OS_OPT, FORCE_VARIANT_OPT, m_force_multi, m_node_opt, |
|
1324 |
m_pri_node_opt, m_sec_node_opt, m_clust_opt, m_inst_opt, SELECT_OS_OPT, |
|
1325 |
SUBMIT_OPT], |
|
1322 | 1326 |
"[-f] <instance>", "Reinstall a stopped instance"), |
1323 | 1327 |
'remove': ( |
1324 | 1328 |
RemoveInstance, ARGS_ONE_INSTANCE, |
Also available in: Unified diff