Revision 2af8b9c9 lib/cli.py

b/lib/cli.py
531 531

  
532 532
  """
533 533
  kind, name = _ExtractTagsObject(opts, args)
534
  cl = GetClient(query=True)
534
  cl = GetClient()
535 535
  result = cl.QueryTags(kind, name)
536 536
  result = list(result)
537 537
  result.sort()
......
2932 2932

  
2933 2933
  # This ensures we're running on the master daemon
2934 2934
  cl = GetClient()
2935
  # Query client
2936
  qcl = GetClient(query=True)
2937 2935

  
2938 2936
  (cluster_name, master_node) = \
2939 2937
    cl.QueryConfigValues(["cluster_name", "master_node"])
2940 2938

  
2941
  online_nodes = GetOnlineNodes([], cl=qcl)
2942
  ssh_ports = GetNodesSshPorts(online_nodes, qcl)
2939
  online_nodes = GetOnlineNodes([], cl=cl)
2940
  ssh_ports = GetNodesSshPorts(online_nodes, cl)
2943 2941

  
2944 2942
  # Don't keep a reference to the client. The master daemon will go away.
2945 2943
  del cl
2946
  del qcl
2947 2944

  
2948 2945
  assert master_node in online_nodes
2949 2946

  
......
3554 3551

  
3555 3552
  """
3556 3553
  if cl is None:
3557
    cl = GetClient(query=True)
3554
    cl = GetClient()
3558 3555

  
3559 3556
  qfilter = []
3560 3557

  

Also available in: Unified diff