Revision 818e28cf lib/client/gnt_node.py
| b/lib/client/gnt_node.py | ||
|---|---|---|
| 123 | 123 |
help=("Ignore the Node(s) offline status"
|
| 124 | 124 |
" (potentially DANGEROUS)")) |
| 125 | 125 |
|
| 126 |
OVS_OPT = cli_option("--ovs", default=False, action="store_true", dest="ovs",
|
|
| 127 |
help=("Enable OpenvSwitch on the new node. This will"
|
|
| 128 |
" initialize OpenvSwitch during gnt-node add")) |
|
| 129 |
|
|
| 130 |
OVS_NAME_OPT = cli_option("--ovs-name", action="store", dest="ovs_name",
|
|
| 131 |
type="string", default=None, |
|
| 132 |
help=("Set name of OpenvSwitch to connect instances"))
|
|
| 133 |
|
|
| 134 |
OVS_LINK_OPT = cli_option("--ovs-link", action="store", dest="ovs_link",
|
|
| 135 |
type="string", default=None, |
|
| 136 |
help=("Physical trunk interface for OpenvSwitch"))
|
|
| 137 |
|
|
| 138 | 126 |
|
| 139 | 127 |
def ConvertStorageType(user_storage_type): |
| 140 | 128 |
"""Converts a user storage type to its internal name. |
| ... | ... | |
| 290 | 278 |
|
| 291 | 279 |
hv_state = dict(opts.hv_state) |
| 292 | 280 |
|
| 293 |
if not opts.ndparams: |
|
| 294 |
ndparams = {constants.ND_OVS: opts.ovs,
|
|
| 295 |
constants.ND_OVS_NAME: opts.ovs_name, |
|
| 296 |
constants.ND_OVS_LINK: opts.ovs_link} |
|
| 297 |
else: |
|
| 298 |
ndparams = opts.ndparams |
|
| 299 |
ndparams[constants.ND_OVS] = opts.ovs |
|
| 300 |
ndparams[constants.ND_OVS_NAME] = opts.ovs_name |
|
| 301 |
ndparams[constants.ND_OVS_LINK] = opts.ovs_link |
|
| 302 |
|
|
| 303 | 281 |
op = opcodes.OpNodeAdd(node_name=args[0], secondary_ip=sip, |
| 304 | 282 |
readd=opts.readd, group=opts.nodegroup, |
| 305 |
vm_capable=opts.vm_capable, ndparams=ndparams, |
|
| 283 |
vm_capable=opts.vm_capable, ndparams=opts.ndparams,
|
|
| 306 | 284 |
master_capable=opts.master_capable, |
| 307 | 285 |
disk_state=disk_state, |
| 308 | 286 |
hv_state=hv_state) |
| ... | ... | |
| 1096 | 1074 |
"add": ( |
| 1097 | 1075 |
AddNode, [ArgHost(min=1, max=1)], |
| 1098 | 1076 |
[SECONDARY_IP_OPT, READD_OPT, NOSSH_KEYCHECK_OPT, NODE_FORCE_JOIN_OPT, |
| 1099 |
NONODE_SETUP_OPT, VERBOSE_OPT, OVS_OPT, OVS_NAME_OPT, OVS_LINK_OPT,
|
|
| 1100 |
NODEGROUP_OPT, PRIORITY_OPT, CAPAB_MASTER_OPT, CAPAB_VM_OPT,
|
|
| 1101 |
NODE_PARAMS_OPT, HV_STATE_OPT, DISK_STATE_OPT],
|
|
| 1077 |
NONODE_SETUP_OPT, VERBOSE_OPT, NODEGROUP_OPT, PRIORITY_OPT,
|
|
| 1078 |
CAPAB_MASTER_OPT, CAPAB_VM_OPT, NODE_PARAMS_OPT, HV_STATE_OPT,
|
|
| 1079 |
DISK_STATE_OPT], |
|
| 1102 | 1080 |
"[-s ip] [--readd] [--no-ssh-key-check] [--force-join]" |
| 1103 |
" [--no-node-setup] [--verbose] [--network] [--ovs] [--ovs-name <vswitch>]" |
|
| 1104 |
" [--ovs-link <phys. if>] <node_name>", |
|
| 1081 |
" [--no-node-setup] [--verbose] [--network] <node_name>", |
|
| 1105 | 1082 |
"Add a node to the cluster"), |
| 1106 | 1083 |
"evacuate": ( |
| 1107 | 1084 |
EvacuateNode, ARGS_ONE_NODE, |
Also available in: Unified diff