Revision 558e2e8a qa/qa_cluster.py

b/qa/qa_cluster.py
104 104
                    "nic-count"):
105 105
    for spec_val in ("min", "max", "std"):
106 106
      spec = qa_config.get("ispec_%s_%s" %
107
                           (spec_type.replace('-', '_'), spec_val), None)
107
                           (spec_type.replace("-", "_"), spec_val), None)
108 108
      if spec:
109 109
        cmd.append("--specs-%s=%s=%d" % (spec_type, spec_val, spec))
110 110

  
111 111
  if master.get("secondary", None):
112 112
    cmd.append("--secondary-ip=%s" % master["secondary"])
113 113

  
114
  bridge = qa_config.get("bridge", None)
115
  if bridge:
116
    cmd.append("--master-netdev=%s" % bridge)
114
  master_netdev = qa_config.get("master-netdev", None)
115
  if master_netdev:
116
    cmd.append("--master-netdev=%s" % master_netdev)
117

  
118
  nicparams = qa_config.get("default-nicparams", None)
119
  if nicparams:
120
    cmd.append("--nic-parameters=%s" %
121
               ",".join(utils.FormatKeyValue(nicparams)))
117 122

  
118 123
  cmd.append(qa_config.get("name"))
119 124
  AssertCommand(cmd)

Also available in: Unified diff