Revision 58ea8d17

b/qa/qa_cluster.py
183 183

  
184 184
  # Assert that OOB is unavailable for all nodes
185 185
  result_output = GetCommandOutput(master["primary"],
186
                                   "gnt-node list --verbose --no-header -o"
186
                                   "gnt-node list --verbose --no-headers -o"
187 187
                                   " powered")
188 188
  AssertEqual(compat.all(powered == "(unavail)"
189 189
                         for powered in result_output.splitlines()), True)
......
201 201

  
202 202
  # All instances should have been stopped now
203 203
  result_output = GetCommandOutput(master["primary"],
204
                                   "gnt-instance list --no-header -o status")
204
                                   "gnt-instance list --no-headers -o status")
205 205
  AssertEqual(compat.all(status == "ADMIN_down"
206 206
                         for status in result_output.splitlines()), True)
207 207

  
......
210 210

  
211 211
  # All instances should have been started now
212 212
  result_output = GetCommandOutput(master["primary"],
213
                                   "gnt-instance list --no-header -o status")
213
                                   "gnt-instance list --no-headers -o status")
214 214
  AssertEqual(compat.all(status == "running"
215 215
                         for status in result_output.splitlines()), True)
216 216

  
b/qa/qa_instance.py
108 108
  AssertCommand(["gnt-instance", "reboot", name])
109 109

  
110 110
  master = qa_config.GetMasterNode()
111
  cmd = ["gnt-instance", "list", "--no-header", "-o", "status", name]
111
  cmd = ["gnt-instance", "list", "--no-headers", "-o", "status", name]
112 112
  result_output = qa_utils.GetCommandOutput(master["primary"],
113 113
                                            utils.ShellQuoteArgs(cmd))
114 114
  AssertEqual(result_output.strip(), constants.INSTST_RUNNING)
b/qa/qa_utils.py
400 400
  """
401 401
  master = qa_config.GetMasterNode()
402 402

  
403
  cmd = [listcmd, "list", "--separator=|", "--no-header",
403
  cmd = [listcmd, "list", "--separator=|", "--no-headers",
404 404
         "--output", ",".join(fields)]
405 405

  
406 406
  if names:
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