Revision 2c88200b

b/doc/design-hugepages-support.rst
30 30
Currently, It is possible to set or modify huge pages mount point at
31 31
cluster level via the hypervisor parameter ``mem_path`` as::
32 32

  
33
	$ gnt-cluster init --no-lvm-storage --no-drbd-storage \
33
	$ gnt-cluster init \
34 34
	>--enabled-hypervisors=kvm -nic-parameters link=br100 \
35 35
	> -H kvm:mem_path=/mount/point/for/hugepages
36 36

  
b/lib/cli.py
135 135
  "NODEGROUP_OPT",
136 136
  "NODE_PARAMS_OPT",
137 137
  "NODE_POWERED_OPT",
138
  "NODRBD_STORAGE_OPT",
139 138
  "NOHDR_OPT",
140 139
  "NOIPCHECK_OPT",
141 140
  "NO_INSTALL_OPT",
......
1467 1466
                             action="store", default=None,
1468 1467
                             help="Specifies usermode helper for DRBD")
1469 1468

  
1470
NODRBD_STORAGE_OPT = cli_option("--no-drbd-storage", dest="drbd_storage",
1471
                                action="store_false", default=True,
1472
                                help="Disable support for DRBD")
1473

  
1474 1469
PRIMARY_IP_VERSION_OPT = \
1475 1470
    cli_option("--primary-ip-version", default=constants.IP4_VERSION,
1476 1471
               action="store", dest="primary_ip_version",
b/lib/client/gnt_cluster.py
1615 1615
     HVLIST_OPT, MAC_PREFIX_OPT, MASTER_NETDEV_OPT, MASTER_NETMASK_OPT,
1616 1616
     NIC_PARAMS_OPT, NOLVM_STORAGE_OPT, NOMODIFY_ETCHOSTS_OPT,
1617 1617
     NOMODIFY_SSH_SETUP_OPT, SECONDARY_IP_OPT, VG_NAME_OPT,
1618
     MAINTAIN_NODE_HEALTH_OPT, UIDPOOL_OPT, DRBD_HELPER_OPT, NODRBD_STORAGE_OPT,
1618
     MAINTAIN_NODE_HEALTH_OPT, UIDPOOL_OPT, DRBD_HELPER_OPT,
1619 1619
     DEFAULT_IALLOCATOR_OPT, PRIMARY_IP_VERSION_OPT, PREALLOC_WIPE_DISKS_OPT,
1620 1620
     NODE_PARAMS_OPT, GLOBAL_SHARED_FILEDIR_OPT, USE_EXTERNAL_MIP_SCRIPT,
1621 1621
     DISK_PARAMS_OPT, HV_STATE_OPT, DISK_STATE_OPT, ENABLED_DISK_TEMPLATES_OPT,
......
1695 1695
     BACKEND_OPT, CP_SIZE_OPT, ENABLED_HV_OPT, HVLIST_OPT, MASTER_NETDEV_OPT,
1696 1696
     MASTER_NETMASK_OPT, NIC_PARAMS_OPT, NOLVM_STORAGE_OPT, VG_NAME_OPT,
1697 1697
     MAINTAIN_NODE_HEALTH_OPT, UIDPOOL_OPT, ADD_UIDS_OPT, REMOVE_UIDS_OPT,
1698
     DRBD_HELPER_OPT, NODRBD_STORAGE_OPT, DEFAULT_IALLOCATOR_OPT,
1698
     DRBD_HELPER_OPT, DEFAULT_IALLOCATOR_OPT,
1699 1699
     RESERVED_LVS_OPT, DRY_RUN_OPT, PRIORITY_OPT, PREALLOC_WIPE_DISKS_OPT,
1700 1700
     NODE_PARAMS_OPT, USE_EXTERNAL_MIP_SCRIPT, DISK_PARAMS_OPT, HV_STATE_OPT,
1701 1701
     DISK_STATE_OPT] + SUBMIT_OPTS +
b/qa/qa_cluster.py
225 225
  qa_config.SetExclusiveStorage(e_s)
226 226

  
227 227
  extra_args = qa_config.get("cluster-init-args")
228

  
228 229
  if extra_args:
230
    # This option was removed in 2.10, but in order to not break QA of older
231
    # branches we remove it from the extra_args if it is in there.
232
    opt_drbd_storage = "--no-drbd-storage"
233
    if opt_drbd_storage in extra_args:
234
      extra_args.remove(opt_drbd_storage)
229 235
    cmd.extend(extra_args)
230 236

  
231 237
  cmd.append(qa_config.get("name"))

Also available in: Unified diff