diff options
| author | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-21 05:08:31 +0000 |
|---|---|---|
| committer | Tarmac <> | 2010-09-21 05:08:31 +0000 |
| commit | 4e727faf450154d89687b1a33dae2159d5b691a0 (patch) | |
| tree | 150f932687ed3ae9e97eb05e2b526fb600d0ba8b /nova/cloudpipe | |
| parent | 8a841dd6d5ea21e28c2396b1f7a0a24923a56202 (diff) | |
| parent | 026f6f2b7f5457f15a258ebed66bb8dda3263eec (diff) | |
Moves keypairs out of ldap and into the common datastore.
Diffstat (limited to 'nova/cloudpipe')
| -rw-r--r-- | nova/cloudpipe/pipelib.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py index 2867bcb21..de6a97fb6 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -58,7 +58,7 @@ class CloudPipe(object): z.write(FLAGS.boot_script_template,'autorun.sh') z.close() - key_name = self.setup_keypair(project.project_manager_id, project_id) + key_name = self.setup_key_pair(project.project_manager_id, project_id) zippy = open(zippath, "r") context = api.APIRequestContext(handler=None, user=project.project_manager, project=project) @@ -74,7 +74,7 @@ class CloudPipe(object): security_groups=["vpn-secgroup"]) zippy.close() - def setup_keypair(self, user_id, project_id): + def setup_key_pair(self, user_id, project_id): key_name = '%s%s' % (project_id, FLAGS.vpn_key_suffix) try: private_key, fingerprint = self.manager.generate_key_pair(user_id, key_name) |