From: Luke Hinds <lukehinds@gmail.com>
Date: Mon, 4 Jul 2016 18:29:34 +0000 (+0100)
Subject: Fix incorrect path for createfiles.py and amended hiera path
X-Git-Tag: colorado.1.0~288
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d06192797130151a119d8854479eba01bbe52cce;p=functest.git

Fix incorrect path for createfiles.py and amended hiera path

JIRA: FUNCTEST-350

Change-Id: I29cdd2e6783fb659a673346d3033b1b2e7b3461b
Signed-off-by: Luke Hinds <lukehinds@gmail.com>
---

diff --git a/testcases/security_scan/security_scan.py b/testcases/security_scan/security_scan.py
index 5910331a0..d39c29052 100644
--- a/testcases/security_scan/security_scan.py
+++ b/testcases/security_scan/security_scan.py
@@ -30,6 +30,7 @@ __url__ = 'https://wiki.opnfv.org/display/functest/Functest+Security'
 # Global vars
 INSTALLER_IP = os.getenv('INSTALLER_IP')
 oscapbin = 'sudo /bin/oscap'
+functest_dir = '/home/opnfv/repos/functest/testcases/security_scan/'
 
 # Apex Spefic var needed to query Undercloud
 if os.getenv('OS_AUTH_URL') is None:
@@ -56,7 +57,7 @@ setup.getockey()
 
 
 # Configure Nova Credentials
-com = 'sudo hiera admin_password'
+com = 'sudo /usr/bin/hiera admin_password'
 setup = connect.SetUp(com)
 keypass = setup.keystonepass()
 auth = v2.Password(auth_url=OS_AUTH_URL,
@@ -108,7 +109,7 @@ def nova_iterate():
 def createfiles(host, port, user, localkey):
     import connect
     global tmpdir
-    localpath = os.getcwd() + '/scripts/createfiles.py'
+    localpath = functest_dir + 'scripts/createfiles.py'
     remotepath = '/tmp/createfiles.py'
     com = 'python /tmp/createfiles.py'
     connect = connect.ConnectionManager(host, port, user, localkey,