Revision 61413377 lib/cli.py

b/lib/cli.py
104 104
  "NEW_RAPI_CERT_OPT",
105 105
  "NEW_SECONDARY_OPT",
106 106
  "NIC_PARAMS_OPT",
107
  "NODE_FORCE_JOIN_OPT",
107 108
  "NODE_LIST_OPT",
108 109
  "NODE_PLACEMENT_OPT",
109 110
  "NODEGROUP_OPT",
......
885 886
                                default=True, action="store_false",
886 887
                                help="Disable SSH key fingerprint checking")
887 888

  
889
NODE_FORCE_JOIN_OPT = cli_option("--force-join", dest="force_join",
890
                                 default=False, action="store_true",
891
                                 help="Force the joining of a node,"
892
                                      " needed when merging clusters")
893

  
888 894
MC_OPT = cli_option("-C", "--master-candidate", dest="master_candidate",
889 895
                    type="bool", default=None, metavar=_YORNO,
890 896
                    help="Set the master_candidate flag on the node")

Also available in: Unified diff