Revision 3601d488 qa/qa_cluster.py

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

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

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

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

  
119 124
  cmd.append(qa_config.get("name"))
120 125
  AssertCommand(cmd)

Also available in: Unified diff