Revision 29392516

b/lib/cli.py
61 61
  "FIELDS_OPT",
62 62
  "FILESTORE_DIR_OPT",
63 63
  "FILESTORE_DRIVER_OPT",
64
  "GLOBAL_FILEDIR_OPT",
64 65
  "HVLIST_OPT",
65 66
  "HVOPTS_OPT",
66 67
  "HYPERVISOR_OPT",
......
70 71
  "IGNORE_SIZE_OPT",
71 72
  "FORCE_OPT",
72 73
  "MAC_PREFIX_OPT",
74
  "MASTER_NETDEV_OPT",
73 75
  "MC_OPT",
74 76
  "NET_OPT",
75 77
  "NEW_SECONDARY_OPT",
......
79 81
  "NOHDR_OPT",
80 82
  "NOIPCHECK_OPT",
81 83
  "NOLVM_STORAGE_OPT",
84
  "NOMODIFY_ETCHOSTS_OPT",
82 85
  "NONICS_OPT",
83 86
  "NONLIVE_OPT",
84 87
  "NOSTART_OPT",
......
759 762
                            metavar="PREFIX",
760 763
                            default=None)
761 764

  
765
MASTER_NETDEV_OPT = cli_option("--master-netdev", dest="master_netdev",
766
                               help="Specify the node interface (cluster-wide)"
767
                               " on which the master IP address will be added "
768
                               " [%s]" % constants.DEFAULT_BRIDGE,
769
                               metavar="NETDEV",
770
                               default=constants.DEFAULT_BRIDGE)
771

  
772

  
773
GLOBAL_FILEDIR_OPT = cli_option("--file-storage-dir", dest="file_storage_dir",
774
                                help="Specify the default directory (cluster-"
775
                                "wide) for storing the file-based disks [%s]" %
776
                                constants.DEFAULT_FILE_STORAGE_DIR,
777
                                metavar="DIR",
778
                                default=constants.DEFAULT_FILE_STORAGE_DIR)
779

  
780
NOMODIFY_ETCHOSTS_OPT = cli_option("--no-etc-hosts", dest="modify_etc_hosts",
781
                                   help="Don't modify /etc/hosts",
782
                                   action="store_false", default=True)
783

  
762 784

  
763 785
def _ParseArgs(argv, commands, aliases):
764 786
  """Parser for the command line arguments.
b/scripts/gnt-cluster
600 600
            SECONDARY_IP_OPT,
601 601
            MAC_PREFIX_OPT,
602 602
            VG_NAME_OPT,
603
            cli_option("--master-netdev", dest="master_netdev",
604
                       help="Specify the node interface (cluster-wide)"
605
                         " on which the master IP address will be added "
606
                         " [%s]" % constants.DEFAULT_BRIDGE,
607
                       metavar="NETDEV",
608
                       default=constants.DEFAULT_BRIDGE,),
609
            cli_option("--file-storage-dir", dest="file_storage_dir",
610
                       help="Specify the default directory (cluster-wide)"
611
                            " for storing the file-based disks [%s]" %
612
                            constants.DEFAULT_FILE_STORAGE_DIR,
613
                       metavar="DIR",
614
                       default=constants.DEFAULT_FILE_STORAGE_DIR,),
603
            MASTER_NETDEV_OPT,
604
            GLOBAL_FILEDIR_OPT,
615 605
            NOLVM_STORAGE_OPT,
616
            cli_option("--no-etc-hosts", dest="modify_etc_hosts",
617
                       help="Don't modify /etc/hosts"
618
                            " (cluster-wide)",
619
                       action="store_false", default=True,),
606
            NOMODIFY_ETCHOSTS_OPT,
620 607
            ENABLED_HV_OPT,
621 608
            HVLIST_OPT,
622 609
            BACKEND_OPT,

Also available in: Unified diff