Revision 61413377
b/lib/cli.py | ||
---|---|---|
104 | 104 |
"NEW_RAPI_CERT_OPT", |
105 | 105 |
"NEW_SECONDARY_OPT", |
106 | 106 |
"NIC_PARAMS_OPT", |
107 |
"NODE_FORCE_JOIN_OPT", |
|
107 | 108 |
"NODE_LIST_OPT", |
108 | 109 |
"NODE_PLACEMENT_OPT", |
109 | 110 |
"NODEGROUP_OPT", |
... | ... | |
885 | 886 |
default=True, action="store_false", |
886 | 887 |
help="Disable SSH key fingerprint checking") |
887 | 888 |
|
889 |
NODE_FORCE_JOIN_OPT = cli_option("--force-join", dest="force_join", |
|
890 |
default=False, action="store_true", |
|
891 |
help="Force the joining of a node," |
|
892 |
" needed when merging clusters") |
|
893 |
|
|
888 | 894 |
MC_OPT = cli_option("-C", "--master-candidate", dest="master_candidate", |
889 | 895 |
type="bool", default=None, metavar=_YORNO, |
890 | 896 |
help="Set the master_candidate flag on the node") |
b/lib/client/gnt_node.py | ||
---|---|---|
134 | 134 |
cmd.append("--verbose") |
135 | 135 |
if not options.ssh_key_check: |
136 | 136 |
cmd.append("--no-ssh-key-check") |
137 |
if options.force_join: |
|
138 |
cmd.append("--force-join") |
|
137 | 139 |
|
138 | 140 |
cmd.extend(nodes) |
139 | 141 |
|
... | ... | |
715 | 717 |
commands = { |
716 | 718 |
'add': ( |
717 | 719 |
AddNode, [ArgHost(min=1, max=1)], |
718 |
[SECONDARY_IP_OPT, READD_OPT, NOSSH_KEYCHECK_OPT, NONODE_SETUP_OPT, |
|
719 |
VERBOSE_OPT, NODEGROUP_OPT, PRIORITY_OPT, CAPAB_MASTER_OPT, |
|
720 |
CAPAB_VM_OPT, NODE_PARAMS_OPT], |
|
721 |
"[-s ip] [--readd] [--no-ssh-key-check] [--no-node-setup] [--verbose] " |
|
720 |
[SECONDARY_IP_OPT, READD_OPT, NOSSH_KEYCHECK_OPT, NODE_FORCE_JOIN_OPT, |
|
721 |
NONODE_SETUP_OPT, VERBOSE_OPT, NODEGROUP_OPT, PRIORITY_OPT, |
|
722 |
CAPAB_MASTER_OPT, CAPAB_VM_OPT, NODE_PARAMS_OPT], |
|
723 |
"[-s ip] [--readd] [--no-ssh-key-check] [--force-join]" |
|
724 |
" [--no-node-setup] [--verbose]" |
|
722 | 725 |
" <node_name>", |
723 | 726 |
"Add a node to the cluster"), |
724 | 727 |
'evacuate': ( |
b/man/gnt-node.rst | ||
---|---|---|
49 | 49 |
drained and offline flags of the node will be cleared before |
50 | 50 |
re-adding it. |
51 | 51 |
|
52 |
The ``--force-join`` option is to proceed with adding a node even if it already |
|
53 |
appears to belong to another cluster. This is used during cluster merging, for |
|
54 |
example. |
|
55 |
|
|
52 | 56 |
The ``-g`` is used to add the new node into a specific node group, |
53 | 57 |
specified by UUID or name. If only one node group exists you can |
54 | 58 |
skip this option, otherwise it's mandatory. |
Also available in: Unified diff