openstack/nova
Code Issues Proposed changes

Revert "Fixes bug 757033"

Browse Source 
This reverts commit 8a0370e4cf4b2004df63588c7a2daf5e676df43e.

Change-Id: I8522eb0e84b7e811020dedc083f8e3c8478e0f8c
This commit is contained in:
Vishvananda Ishaya 2011-11-21 16:39:02 -08:00
parent d015221060
commit a3ea70c080
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/crypto.py
View File

@ -223,7 +223,8 @@ def generate_x509_cert(user_id, project_id, bits=1024):
def _ensure_project_folder(project_id): def _ensure_project_folder(project_id):
if not os.path.exists(ca_path(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') 'geninter.sh')
start = os.getcwd() start = os.getcwd()
os.chdir(ca_folder()) os.chdir(ca_folder())
@ -237,7 +238,8 @@ def generate_vpn_files(project_id):
csr_fn = os.path.join(project_folder, 'server.csr') csr_fn = os.path.join(project_folder, 'server.csr')
crt_fn = os.path.join(project_folder, 'server.crt') 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') 'genvpn.sh')
if os.path.exists(crt_fn): if os.path.exists(crt_fn):
return return