diff options
| author | Soren Hansen <soren@linux2go.dk> | 2011-04-05 11:42:14 +0200 |
|---|---|---|
| committer | Soren Hansen <soren@linux2go.dk> | 2011-04-05 11:42:14 +0200 |
| commit | ff23dd2a3b86c816da04eddc903de0c8c3141954 (patch) | |
| tree | 96220754ec423a66ba6b4398d004b1cb9e58b78c /nova/crypto.py | |
| parent | c0a8904508edb0687b588d40a7bd181d0393884f (diff) | |
| download | nova-ff23dd2a3b86c816da04eddc903de0c8c3141954.tar.gz nova-ff23dd2a3b86c816da04eddc903de0c8c3141954.tar.xz nova-ff23dd2a3b86c816da04eddc903de0c8c3141954.zip | |
Allow CA code and state to be separated, and make sure CA code gets installed by setup.py install.
Diffstat (limited to 'nova/crypto.py')
| -rw-r--r-- | nova/crypto.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/nova/crypto.py b/nova/crypto.py index b112e5b92..2b122e560 100644 --- a/nova/crypto.py +++ b/nova/crypto.py @@ -215,9 +215,12 @@ 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') start = os.getcwd() os.chdir(ca_folder()) - utils.execute('sh', 'geninter.sh', project_id, + utils.execute('sh', geninter_sh_path, project_id, _project_cert_subject(project_id)) os.chdir(start) @@ -227,13 +230,16 @@ 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', + 'geninter.sh') if os.path.exists(crt_fn): return _ensure_project_folder(project_id) start = os.getcwd() os.chdir(ca_folder()) # TODO(vish): the shell scripts could all be done in python - utils.execute('sh', 'genvpn.sh', + utils.execute('sh', genvpn_sh_path, project_id, _vpn_cert_subject(project_id)) with open(csr_fn, "r") as csrfile: csr_text = csrfile.read() |