From 734fd6b411ad278809e1a18230ed6a16715e222e Mon Sep 17 00:00:00 2001 From: Michael Hanselmann <hansmi@google.com> Date: Thu, 21 Feb 2013 15:33:45 +0100 Subject: [PATCH] QA: Update virtual node's RAPI users file The file is located below the virtual node directory. Signed-off-by: Michael Hanselmann <hansmi@google.com> Reviewed-by: Bernardo Dal Seno <bdalseno@google.com> --- qa/qa_cluster.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py index 8bde8ee8b..813036c95 100644 --- a/qa/qa_cluster.py +++ b/qa/qa_cluster.py @@ -153,7 +153,8 @@ def TestClusterInit(rapi_user, rapi_secret): """gnt-cluster init""" master = qa_config.GetMasterNode() - rapi_dir = os.path.dirname(pathutils.RAPI_USERS_FILE) + rapi_users_path = qa_utils.MakeNodePath(master, pathutils.RAPI_USERS_FILE) + rapi_dir = os.path.dirname(rapi_users_path) # First create the RAPI credentials fh = tempfile.NamedTemporaryFile() @@ -164,7 +165,7 @@ def TestClusterInit(rapi_user, rapi_secret): tmpru = qa_utils.UploadFile(master.primary, fh.name) try: AssertCommand(["mkdir", "-p", rapi_dir]) - AssertCommand(["mv", tmpru, pathutils.RAPI_USERS_FILE]) + AssertCommand(["mv", tmpru, rapi_users_path]) finally: AssertCommand(["rm", "-f", tmpru]) finally: -- GitLab