Merge "Revert "Fixes bug 757033""

openstack · Nov 22, 2011 · e35ed7c · e35ed7c
2 parents b07d3cd + a3ea70c
commit e35ed7c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git 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