Revision 0fcb3314 lib/client/gnt_cluster.py

b/lib/client/gnt_cluster.py
33 33
import itertools
34 34

  
35 35
from ganeti.cli import *
36
from ganeti import opcodes
37
from ganeti import constants
38
from ganeti import errors
39
from ganeti import utils
40 36
from ganeti import bootstrap
41
from ganeti import ssh
42
from ganeti import objects
43
from ganeti import uidpool
44 37
from ganeti import compat
38
from ganeti import constants
39
from ganeti import errors
45 40
from ganeti import netutils
46
from ganeti import ssconf
41
from ganeti import objects
42
from ganeti import opcodes
47 43
from ganeti import pathutils
48
from ganeti import serializer
49 44
from ganeti import qlang
45
from ganeti import serializer
46
from ganeti import ssconf
47
from ganeti import ssh
48
from ganeti import uidpool
49
from ganeti import utils
50
from ganeti.client import base
50 51

  
51 52

  
52 53
ON_OPT = cli_option("--on", default=False,
......
1114 1115
          opts.ipolicy_vcpu_ratio is not None or
1115 1116
          opts.ipolicy_spindle_ratio is not None or
1116 1117
          opts.modify_etc_hosts is not None or
1117
          opts.file_storage_dir is not None):
1118
          opts.file_storage_dir is not None or
1119
          opts.instance_communication_network is not None):
1118 1120
    ToStderr("Please give at least one of the parameters.")
1119 1121
    return 1
1120 1122

  
......
1225 1227
    enabled_disk_templates=enabled_disk_templates,
1226 1228
    force=opts.force,
1227 1229
    file_storage_dir=opts.file_storage_dir,
1230
    instance_communication_network=opts.instance_communication_network
1228 1231
    )
1229
  SubmitOrSend(op, opts)
1230
  return 0
1232
  return base.GetResult(None, opts, SubmitOrSend(op, opts))
1231 1233

  
1232 1234

  
1233 1235
def QueueOps(opts, args):
......
2165 2167
  "modify": (
2166 2168
    SetClusterParams, ARGS_NONE,
2167 2169
    [FORCE_OPT,
2168
     BACKEND_OPT, CP_SIZE_OPT, RQL_OPT,
2170
     BACKEND_OPT, CP_SIZE_OPT, RQL_OPT, INSTANCE_COMMUNICATION_NETWORK_OPT,
2169 2171
     ENABLED_HV_OPT, HVLIST_OPT, MASTER_NETDEV_OPT,
2170 2172
     MASTER_NETMASK_OPT, NIC_PARAMS_OPT, VG_NAME_OPT, MAINTAIN_NODE_HEALTH_OPT,
2171 2173
     UIDPOOL_OPT, ADD_UIDS_OPT, REMOVE_UIDS_OPT, DRBD_HELPER_OPT,

Also available in: Unified diff