Revision 58ea8d17 tools/cluster-merge

b/tools/cluster-merge
192 192
      utils.WriteFile(key_path, mode=0600, data=result.stdout)
193 193

  
194 194
      result = self._RunCmd(cluster, "gnt-node list -o name,offline"
195
                            " --no-header --separator=,", private_key=key_path)
195
                            " --no-headers --separator=,", private_key=key_path)
196 196
      if result.failed:
197 197
        raise errors.RemoteError("Unable to retrieve list of nodes from %s."
198 198
                                 " Fail reason: %s; output: %s" %
......
201 201
      nodes = [node_status[0] for node_status in nodes_statuses
202 202
               if node_status[1] == "N"]
203 203

  
204
      result = self._RunCmd(cluster, "gnt-instance list -o name --no-header",
204
      result = self._RunCmd(cluster, "gnt-instance list -o name --no-headers",
205 205
                            private_key=key_path)
206 206
      if result.failed:
207 207
        raise errors.RemoteError("Unable to retrieve list of instances from"

Also available in: Unified diff