diff options
| author | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-09-21 12:00:44 -0400 |
|---|---|---|
| committer | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-09-21 12:00:44 -0400 |
| commit | bbf17139fc7fbc9fc3acd336b3c5c5df97dcf408 (patch) | |
| tree | 55ab3fe832c55203bd5ff9852fc5291b1801bfb2 /nova/cloudpipe | |
| parent | 9ea20110ae05a0bd5294774c2ee11626e9c4147f (diff) | |
| parent | ce0a9b7b36ba816c347f10a1804aedf337ad35da (diff) | |
| download | nova-bbf17139fc7fbc9fc3acd336b3c5c5df97dcf408.tar.gz nova-bbf17139fc7fbc9fc3acd336b3c5c5df97dcf408.tar.xz nova-bbf17139fc7fbc9fc3acd336b3c5c5df97dcf408.zip | |
Merge from trunk
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 97272eda6..b13a60292 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 = context.APIRequestContext(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) |