diff options
| author | Soren Hansen <soren@linux2go.dk> | 2011-04-05 16:47:39 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-04-05 16:47:39 +0000 |
| commit | 2ba10bc869a716086fcdc5da91c43e67644ee58c (patch) | |
| tree | 6cb2cac12d8bceb96941f5f3796a1ae5944cc2b1 /nova/api | |
| parent | c0a8904508edb0687b588d40a7bd181d0393884f (diff) | |
| parent | d7013c9617d0740976a78ba87b1214c2b15ee702 (diff) | |
Separate CA/ dir into code and state.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 425784e8a..5d6d9537a 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -103,10 +103,17 @@ class CloudController(object): # Gen root CA, if we don't have one root_ca_path = os.path.join(FLAGS.ca_path, FLAGS.ca_file) if not os.path.exists(root_ca_path): + genrootca_sh_path = os.path.join(os.path.dirname(__file__), + os.path.pardir, + os.path.pardir, + 'CA', + 'genrootca.sh') + start = os.getcwd() + os.makedirs(FLAGS.ca_path) os.chdir(FLAGS.ca_path) # TODO(vish): Do this with M2Crypto instead - utils.runthis(_("Generating root CA: %s"), "sh", "genrootca.sh") + utils.runthis(_("Generating root CA: %s"), "sh", genrootca_sh_path) os.chdir(start) def _get_mpi_data(self, context, project_id): |