Revision c632d3a5 qa/qa_node.py

b/qa/qa_node.py
237 237

  
238 238
def TestNodeModify(node):
239 239
  """gnt-node modify"""
240

  
241
  # make sure enough master candidates will be available by disabling the
242
  # master candidate role first with --auto-promote
243
  AssertCommand(["gnt-node", "modify", "--master-candidate=no",
244
                "--auto-promote", node.primary])
245

  
246
  # now it's save to force-remove the master candidate role
240 247
  for flag in ["master-candidate", "drained", "offline"]:
241 248
    for value in ["yes", "no"]:
242 249
      AssertCommand(["gnt-node", "modify", "--force",
243 250
                     "--%s=%s" % (flag, value), node.primary])
244 251

  
245
  AssertCommand(["gnt-node", "modify", "--master-candidate=yes",
246
                 "--auto-promote", node.primary])
252
  AssertCommand(["gnt-node", "modify", "--master-candidate=yes", node.primary])
247 253

  
248 254
  # Test setting secondary IP address
249 255
  AssertCommand(["gnt-node", "modify", "--secondary-ip=%s" % node.secondary,

Also available in: Unified diff