diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-11-21 16:39:02 -0800 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-11-21 16:39:25 -0800 |
| commit | a3ea70c0809f62a0a7b09199bd31fbed704ebf9d (patch) | |
| tree | 4b2b32b5b61a68183b94fd32eab51b09c839ffd0 | |
| parent | d0152210600e00a3ff87b83c1af666a2fb7a2abf (diff) | |
| download | nova-a3ea70c0809f62a0a7b09199bd31fbed704ebf9d.tar.gz nova-a3ea70c0809f62a0a7b09199bd31fbed704ebf9d.tar.xz nova-a3ea70c0809f62a0a7b09199bd31fbed704ebf9d.zip | |
Revert "Fixes bug 757033"
This reverts commit 8a0370e4cf4b2004df63588c7a2daf5e676df43e.
Change-Id: I8522eb0e84b7e811020dedc083f8e3c8478e0f8c
| -rw-r--r-- | nova/crypto.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/crypto.py b/nova/crypto.py index 88060152c..e97852572 100644 --- a/nova/crypto.py +++ b/nova/crypto.py @@ -223,7 +223,8 @@ def generate_x509_cert(user_id, project_id, bits=1024): def _ensure_project_folder(project_id): if not os.path.exists(ca_path(project_id)): - geninter_sh_path = os.path.join(FLAGS.ca_path, + geninter_sh_path = os.path.join(os.path.dirname(__file__), + 'CA', 'geninter.sh') start = os.getcwd() os.chdir(ca_folder()) @@ -237,7 +238,8 @@ def generate_vpn_files(project_id): csr_fn = os.path.join(project_folder, 'server.csr') crt_fn = os.path.join(project_folder, 'server.crt') - genvpn_sh_path = os.path.join(FLAGS.ca_path, + genvpn_sh_path = os.path.join(os.path.dirname(__file__), + 'CA', 'genvpn.sh') if os.path.exists(crt_fn): return |