Revision 3ccafd0e lib/cmdlib.py

b/lib/cmdlib.py
1891 1891
  def ExpandNames(self):
1892 1892
    self.needed_locks = {}
1893 1893

  
1894
    static_fields = ["cluster_name", "master_node"]
1894
    static_fields = ["cluster_name", "master_node", "drain_flag"]
1895 1895
    _CheckOutputFields(static=static_fields,
1896 1896
                       dynamic=[],
1897 1897
                       selected=self.op.output_fields)
......
1909 1909
    values = []
1910 1910
    for field in self.op.output_fields:
1911 1911
      if field == "cluster_name":
1912
        values.append(self.cfg.GetClusterName())
1912
        entry = self.cfg.GetClusterName()
1913 1913
      elif field == "master_node":
1914
        values.append(self.cfg.GetMasterNode())
1914
        entry = self.cfg.GetMasterNode()
1915
      elif field == "drain_flag":
1916
        entry = os.path.exists(constants.JOB_QUEUE_DRAIN_FILE)
1915 1917
      else:
1916 1918
        raise errors.ParameterError(field)
1919
      values.append(entry)
1917 1920
    return values
1918 1921

  
1919 1922

  

Also available in: Unified diff