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/api | |
| parent | c0a8904508edb0687b588d40a7bd181d0393884f (diff) | |
Allow CA code and state to be separated, and make sure CA code gets installed by setup.py install.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 425784e8a..f119bd75c 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -103,10 +103,16 @@ 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.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): |