Revision 5e96d216

b/daemons/ganeti-masterd
396 396
                    help="Do not check that the nodes agree on this node"
397 397
                    " being the master and start the daemon unconditionally",
398 398
                    default=False, action="store_true")
399
  parser.add_option("--yes-do-it", dest="yes_do_it",
400
                    help="Override interactive check for --no-voting",
401
                    default=False, action="store_true")
402

  
399 403
  options, args = parser.parse_args()
400 404
  return options, args
401 405

  
......
472 476
    ssconf.CheckMaster(options.debug)
473 477

  
474 478
    # we believe we are the master, let's ask the other nodes...
475
    if options.no_voting:
479
    if options.no_voting and not options.yes_do_it:
476 480
      sys.stdout.write("The 'no voting' option has been selected.\n")
477 481
      sys.stdout.write("This is dangerous, please confirm by"
478 482
                       " typing uppercase 'yes': ")
......
481 485
      if confirmation != "YES":
482 486
        print "Aborting."
483 487
        return
484
    else:
488
    elif not options.no_voting:
485 489
      if not CheckAgreement():
486 490
        return
487 491

  

Also available in: Unified diff