← Back to branch summary

~gandelman-a/ubuntu/precise/nova/UCA_2012.2.1

« back to all changes in this revision

Viewing changes to nova/cloudpipe/pipelib.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2012-08-16 14:04:11 UTC
  • mfrom: (1.1.59)
  • Revision ID: package-import@ubuntu.com-20120816140411-8dvudjblnx1w0mwx
Tags: 2012.2~f3-0ubuntu1
https://launchpad.net/bugs/1002111
[ Chuck Short ]
* New upstream version.
* debian/rules: Re-enable testsuite.
* debian/control:
  - Add python-quantumclient as a build depends.
  - Bump standards to 3.9.3
  - Fix lintian warnings.
  - Recommend python-glanceclient and python-keystoneclient.
  - Add dependency of iptables for nova-network.
* debian/watch: Update
* debian/rules: Do not run pep8 tests since upstream is still using an
  older pep8.
* debian/patches/0001-Update-tools-hacking-for-pep8-1.2-and-
  beyond.patch: Get the testsuite running again.
* debian/nova-volume.install, debian/nova_tgt: Add support for
  persistent volumes.

[ Adam Gandelman ]
* debian/{nova-api.install, nova-api-metadata.install}: Install
  api-metadata.filters. (LP: #1002111)
* debian/control: Added python-glanceclient.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/cloudpipe/pipelib.py
26
26
import string
27
27
import zipfile
28
28
 
29
 
# NOTE(vish): cloud is only for the _gen_key functionality
30
 
from nova.api.ec2 import cloud
31
29
from nova import compute
32
30
from nova.compute import instance_types
33
31
from nova import crypto
146
144
    def setup_key_pair(self, context):
147
145
        key_name = '%s%s' % (context.project_id, FLAGS.vpn_key_suffix)
148
146
        try:
149
 
            result = cloud._gen_key(context, context.user_id, key_name)
 
147
            keypair_api = compute.api.KeypairAPI()
 
148
            result = keypair_api.create_key_pair(context,
 
149
                                                 context.user_id,
 
150
                                                 key_name)
150
151
            private_key = result['private_key']
151
152
            key_dir = os.path.join(FLAGS.keys_path, context.user_id)
152
153
            if not os.path.exists(key_dir):