diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-18 22:42:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-18 22:42:18 +0000 |
| commit | 32f969ad59c70f308c7d2c8cfc54a1b6ffd572b1 (patch) | |
| tree | 33e5d496f0ad29b37d212d0e15d27b4a9048dc19 | |
| parent | 55ebe48ab8026d3806c3f0521fb4643634c1162b (diff) | |
| parent | 8a0370e4cf4b2004df63588c7a2daf5e676df43e (diff) | |
Merge "Fixes bug 757033"
| -rw-r--r-- | nova/crypto.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nova/crypto.py b/nova/crypto.py index e97852572..88060152c 100644 --- a/nova/crypto.py +++ b/nova/crypto.py @@ -223,8 +223,7 @@ 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(os.path.dirname(__file__), - 'CA', + geninter_sh_path = os.path.join(FLAGS.ca_path, 'geninter.sh') start = os.getcwd() os.chdir(ca_folder()) @@ -238,8 +237,7 @@ 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(os.path.dirname(__file__), - 'CA', + genvpn_sh_path = os.path.join(FLAGS.ca_path, 'genvpn.sh') if os.path.exists(crt_fn): return |