summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-05-29 15:31:17 +0000
committerGerrit Code Review <review@openstack.org>2013-05-29 15:31:17 +0000
commit3a024ba3762af170ea493526a6010dfcccb8e30b (patch)
treefce78fb5af831f6416f3e30b6f1adf4f9a9b8544
parentd467dafd7b969267cc884f7e7175ee8f724a32d2 (diff)
parent2cd1783bd5604937d5fbfa23ebd87b9009e95138 (diff)
downloadnova-3a024ba3762af170ea493526a6010dfcccb8e30b.tar.gz
nova-3a024ba3762af170ea493526a6010dfcccb8e30b.tar.xz
nova-3a024ba3762af170ea493526a6010dfcccb8e30b.zip
Merge "Add missing os.path.abspath around csrfile."
-rw-r--r--nova/crypto.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/crypto.py b/nova/crypto.py
index 0447bd9b8..b312aca2d 100644
--- a/nova/crypto.py
+++ b/nova/crypto.py
@@ -324,7 +324,7 @@ def generate_x509_cert(user_id, project_id, bits=1024):
with utils.tempdir() as tmpdir:
keyfile = os.path.abspath(os.path.join(tmpdir, 'temp.key'))
- csrfile = os.path.join(tmpdir, 'temp.csr')
+ csrfile = os.path.abspath(os.path.join(tmpdir, 'temp.csr'))
utils.execute('openssl', 'genrsa', '-out', keyfile, str(bits))
utils.execute('openssl', 'req', '-new', '-key', keyfile, '-out',
csrfile, '-batch', '-subj', subject)