Revision 0b0a150a qa/qa_cluster.py

b/qa/qa_cluster.py
148 148
  """Burnin"""
149 149
  master = qa_config.GetMasterNode()
150 150

  
151
  disk_template = (qa_config.get('options', {}).
152
                   get('burnin-disk-template', 'drbd'))
151
  options = qa_config.get('options', {})
152
  disk_template = options.get('burnin-disk-template', 'drbd')
153
  parallel = options.get('burnin-in-parallel', False)
154
  check_inst = options.get('burnin-check-instances', False)
153 155

  
154 156
  # Get as many instances as we need
155 157
  instances = []
......
168 170
    try:
169 171
      # Run burnin
170 172
      cmd = [script,
173
             '-p',
171 174
             '--os=%s' % qa_config.get('os'),
172 175
             '--disk-size=%s' % ",".join(qa_config.get('disk')),
173 176
             '--disk-growth=%s' % ",".join(qa_config.get('disk-growth')),
174 177
             '--disk-template=%s' % disk_template]
178
      if parallel:
179
        cmd.append('--parallel')
180
      if check_inst:
181
        cmd.append('--http-check')
175 182
      cmd += [inst['name'] for inst in instances]
176 183
      AssertEqual(StartSSH(master['primary'],
177 184
                           utils.ShellQuoteArgs(cmd)).wait(), 0)

Also available in: Unified diff