Revision a0eeb01a
b/lib/cli.py | ||
---|---|---|
165 | 165 |
"ON_SECONDARY_OPT", |
166 | 166 |
"OFFLINE_OPT", |
167 | 167 |
"OSPARAMS_OPT", |
168 |
"OSPARAMS_PRIVATE_OPT", |
|
169 |
"OSPARAMS_SECRET_OPT", |
|
168 | 170 |
"OS_OPT", |
169 | 171 |
"OS_SIZE_OPT", |
170 | 172 |
"OOB_TIMEOUT_OPT", |
... | ... | |
948 | 950 |
type="keyval", default={}, |
949 | 951 |
help="OS parameters") |
950 | 952 |
|
953 |
OSPARAMS_PRIVATE_OPT = cli_option("--os-parameters-private", |
|
954 |
dest="osparams_private", |
|
955 |
type="keyprivateval", |
|
956 |
default=serializer.PrivateDict(), |
|
957 |
help="Private OS parameters" |
|
958 |
" (won't be logged)") |
|
959 |
|
|
960 |
OSPARAMS_SECRET_OPT = cli_option("--os-parameters-secret", |
|
961 |
dest="osparams_secret", |
|
962 |
type="keyprivateval", |
|
963 |
default=serializer.PrivateDict(), |
|
964 |
help="Secret OS parameters (won't be logged or" |
|
965 |
" saved; you must supply these for every" |
|
966 |
" operation.)") |
|
967 |
|
|
951 | 968 |
FORCE_VARIANT_OPT = cli_option("--force-variant", dest="force_variant", |
952 | 969 |
action="store_true", default=False, |
953 | 970 |
help="Force an unknown variant") |
b/lib/client/gnt_instance.py | ||
---|---|---|
1546 | 1546 |
[FORCE_OPT, OS_OPT, FORCE_VARIANT_OPT, m_force_multi, m_node_opt, |
1547 | 1547 |
m_pri_node_opt, m_sec_node_opt, m_clust_opt, m_inst_opt, m_node_tags_opt, |
1548 | 1548 |
m_pri_node_tags_opt, m_sec_node_tags_opt, m_inst_tags_opt, SELECT_OS_OPT] |
1549 |
+ SUBMIT_OPTS + [DRY_RUN_OPT, PRIORITY_OPT, OSPARAMS_OPT], |
|
1549 |
+ SUBMIT_OPTS + [DRY_RUN_OPT, PRIORITY_OPT, OSPARAMS_OPT, |
|
1550 |
OSPARAMS_NOLOG_OPT, OSPARAMS_NOLOG_NOSAVE_OPT], |
|
1550 | 1551 |
"[-f] <instance>", "Reinstall a stopped instance"), |
1551 | 1552 |
"remove": ( |
1552 | 1553 |
RemoveInstance, ARGS_ONE_INSTANCE, |
... | ... | |
1570 | 1571 |
SetInstanceParams, ARGS_ONE_INSTANCE, |
1571 | 1572 |
[BACKEND_OPT, DISK_OPT, FORCE_OPT, HVOPTS_OPT, NET_OPT] + SUBMIT_OPTS + |
1572 | 1573 |
[DISK_TEMPLATE_OPT, SINGLE_NODE_OPT, OS_OPT, FORCE_VARIANT_OPT, |
1573 |
OSPARAMS_OPT, DRY_RUN_OPT, PRIORITY_OPT, NWSYNC_OPT, OFFLINE_INST_OPT,
|
|
1574 |
ONLINE_INST_OPT, IGNORE_IPOLICY_OPT, RUNTIME_MEM_OPT, |
|
1574 |
OSPARAMS_OPT, OSPARAMS_NOLOG_OPT, DRY_RUN_OPT, PRIORITY_OPT, NWSYNC_OPT,
|
|
1575 |
OFFLINE_INST_OPT, ONLINE_INST_OPT, IGNORE_IPOLICY_OPT, RUNTIME_MEM_OPT,
|
|
1575 | 1576 |
NOCONFLICTSCHECK_OPT, NEW_PRIMARY_OPT, HOTPLUG_OPT, |
1576 | 1577 |
HOTPLUG_IF_POSSIBLE_OPT], |
1577 | 1578 |
"<instance>", "Alters the parameters of an instance"), |
Also available in: Unified diff