On Thu, Aug 22, 2013 at 10:16 AM, Helga Velroyen <[email protected]> wrote:
> This removes the '--no-drbd-storage' option completely > from the command line interface. > > Signed-off-by: Helga Velroyen <[email protected]> > --- > doc/design-hugepages-support.rst | 2 +- > lib/cli.py | 5 ----- > lib/client/gnt_cluster.py | 4 ++-- > qa/qa_cluster.py | 6 ++++++ > 4 files changed, 9 insertions(+), 8 deletions(-) > > diff --git a/doc/design-hugepages-support.rst > b/doc/design-hugepages-support.rst > index ff12978..62c4bce 100644 > --- a/doc/design-hugepages-support.rst > +++ b/doc/design-hugepages-support.rst > @@ -30,7 +30,7 @@ Hypervisor Parameters: > Currently, It is possible to set or modify huge pages mount point at > cluster level via the hypervisor parameter ``mem_path`` as:: > > - $ gnt-cluster init --no-lvm-storage --no-drbd-storage \ > + $ gnt-cluster init \ > --no-lvm-storage disappears as well? Is this an error? Otherwise state in the commit description please. > >--enabled-hypervisors=kvm -nic-parameters link=br100 \ > > -H kvm:mem_path=/mount/point/for/hugepages > > diff --git a/lib/cli.py b/lib/cli.py > index d86c5c0..4dc71e6 100644 > --- a/lib/cli.py > +++ b/lib/cli.py > @@ -135,7 +135,6 @@ __all__ = [ > "NODEGROUP_OPT", > "NODE_PARAMS_OPT", > "NODE_POWERED_OPT", > - "NODRBD_STORAGE_OPT", > "NOHDR_OPT", > "NOIPCHECK_OPT", > "NO_INSTALL_OPT", > @@ -1467,10 +1466,6 @@ DRBD_HELPER_OPT = > cli_option("--drbd-usermode-helper", dest="drbd_helper", > action="store", default=None, > help="Specifies usermode helper for DRBD") > > -NODRBD_STORAGE_OPT = cli_option("--no-drbd-storage", dest="drbd_storage", > - action="store_false", default=True, > - help="Disable support for DRBD") > - > PRIMARY_IP_VERSION_OPT = \ > cli_option("--primary-ip-version", default=constants.IP4_VERSION, > action="store", dest="primary_ip_version", > diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py > index 9bca0ac..9056687 100644 > --- a/lib/client/gnt_cluster.py > +++ b/lib/client/gnt_cluster.py > @@ -1622,7 +1622,7 @@ commands = { > HVLIST_OPT, MAC_PREFIX_OPT, MASTER_NETDEV_OPT, MASTER_NETMASK_OPT, > NIC_PARAMS_OPT, NOLVM_STORAGE_OPT, NOMODIFY_ETCHOSTS_OPT, > NOMODIFY_SSH_SETUP_OPT, SECONDARY_IP_OPT, VG_NAME_OPT, > - MAINTAIN_NODE_HEALTH_OPT, UIDPOOL_OPT, DRBD_HELPER_OPT, > NODRBD_STORAGE_OPT, > + MAINTAIN_NODE_HEALTH_OPT, UIDPOOL_OPT, DRBD_HELPER_OPT, > DEFAULT_IALLOCATOR_OPT, PRIMARY_IP_VERSION_OPT, > PREALLOC_WIPE_DISKS_OPT, > NODE_PARAMS_OPT, GLOBAL_SHARED_FILEDIR_OPT, USE_EXTERNAL_MIP_SCRIPT, > DISK_PARAMS_OPT, HV_STATE_OPT, DISK_STATE_OPT, > ENABLED_DISK_TEMPLATES_OPT, > @@ -1702,7 +1702,7 @@ commands = { > BACKEND_OPT, CP_SIZE_OPT, ENABLED_HV_OPT, HVLIST_OPT, > MASTER_NETDEV_OPT, > MASTER_NETMASK_OPT, NIC_PARAMS_OPT, NOLVM_STORAGE_OPT, VG_NAME_OPT, > MAINTAIN_NODE_HEALTH_OPT, UIDPOOL_OPT, ADD_UIDS_OPT, REMOVE_UIDS_OPT, > - DRBD_HELPER_OPT, NODRBD_STORAGE_OPT, DEFAULT_IALLOCATOR_OPT, > + DRBD_HELPER_OPT, DEFAULT_IALLOCATOR_OPT, > RESERVED_LVS_OPT, DRY_RUN_OPT, PRIORITY_OPT, PREALLOC_WIPE_DISKS_OPT, > NODE_PARAMS_OPT, USE_EXTERNAL_MIP_SCRIPT, DISK_PARAMS_OPT, > HV_STATE_OPT, > DISK_STATE_OPT] + SUBMIT_OPTS + > diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py > index 192141f..7c256b1 100644 > --- a/qa/qa_cluster.py > +++ b/qa/qa_cluster.py > @@ -225,7 +225,13 @@ def TestClusterInit(rapi_user, rapi_secret): > qa_config.SetExclusiveStorage(e_s) > > extra_args = qa_config.get("cluster-init-args") > + > if extra_args: > + # This option was removed in 2.10, but in order to not break QA of > older > + # branches we remove it from the extra_args if it is in there. > + opt_drbd_storage = "--no-drbd-storage" > + if opt_drbd_storage in extra_args: > + extra_args.remove(opt_drbd_storage) > cmd.extend(extra_args) > > cmd.append(qa_config.get("name")) > -- > 1.8.3 > > Rest LGTM, thanks. -- Thomas Thrainer | Software Engineer | [email protected] | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
