Commit 6383059d authored by Thomas Thrainer's avatar Thomas Thrainer
Browse files

Fix passing of ispecs in cluster init during QA



The ispecs were previously passed as multiple parameters to gnt-cluster
init, which did not yield the desired result. This patch changes this
behavior and passes the min/std/max values in one parameter.
Signed-off-by: default avatarThomas Thrainer <thomasth@google.com>
Reviewed-by: default avatarKlaus Aehlig <aehlig@google.com>
parent 03e86e97
......@@ -192,11 +192,14 @@ def TestClusterInit(rapi_user, rapi_secret):
for spec_type in ("mem-size", "disk-size", "disk-count", "cpu-count",
"nic-count"):
spec_values = []
for spec_val in ("min", "max", "std"):
spec = qa_config.get("ispec_%s_%s" %
(spec_type.replace("-", "_"), spec_val), None)
if spec is not None:
cmd.append("--specs-%s=%s=%d" % (spec_type, spec_val, spec))
spec_values.append("%s=%d" % (spec_val, spec))
if spec_values:
cmd.append("--specs-%s=%s" % (spec_type, ",".join(spec_values)))
if master.secondary:
cmd.append("--secondary-ip=%s" % master.secondary)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment