Revision 304d9f02 qa/qa_instance.py
b/qa/qa_instance.py | ||
---|---|---|
29 | 29 |
from ganeti import utils |
30 | 30 |
from ganeti import constants |
31 | 31 |
from ganeti import query |
32 |
from ganeti import pathutils |
|
32 | 33 |
|
33 | 34 |
import qa_config |
34 | 35 |
import qa_utils |
... | ... | |
208 | 209 |
""" |
209 | 210 |
master = qa_config.GetMasterNode() |
210 | 211 |
|
211 |
cmd = ["cat", utils.PathJoin(constants.DATA_DIR,
|
|
212 |
cmd = ["cat", utils.PathJoin(pathutils.DATA_DIR,
|
|
212 | 213 |
"ssconf_%s" % constants.SS_INSTANCE_LIST)] |
213 | 214 |
|
214 | 215 |
return qa_utils.GetCommandOutput(master["primary"], |
... | ... | |
542 | 543 |
"--disk-template=plain", |
543 | 544 |
"--no-ip-check", |
544 | 545 |
"--src-node=%s" % expnode["primary"], |
545 |
"--src-dir=%s/%s" % (constants.EXPORT_DIR, name),
|
|
546 |
"--src-dir=%s/%s" % (pathutils.EXPORT_DIR, name),
|
|
546 | 547 |
"--node=%s" % node["primary"]] + |
547 | 548 |
_GetGenericAddParameters(newinst, force_mac=constants.VALUE_GENERATE)) |
548 | 549 |
cmd.append(newinst["name"]) |
Also available in: Unified diff