← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-proposed

« back to all changes in this revision

Viewing changes to nova/cloudpipe/pipelib.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2013-09-09 13:11:11 UTC
  • mfrom: (1.1.74)
  • Revision ID: package-import@ubuntu.com-20130909131111-aw02ice50wac9tma
Tags: 1:2013.2~b3-0ubuntu1
* New usptream release. 
* debian/patches/avoid_requirements_cheetah.patch: Dropped
* debian/patches/fix-sqlalchemy-0.7.9-usage.patch: Dropped
* debian/patches/fix-requirements.patch: Refreshed.
* debian/patches/path-to-the-xenhost.conf-fixup.patch: Refreshed
* debian/control: Add python-jinja2
* debian/control: Dropped python-cheetah

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/cloudpipe/pipelib.py
34
34
from nova import db
35
35
from nova import exception
36
36
from nova.openstack.common import fileutils
 
37
from nova.openstack.common.gettextutils import _
37
38
from nova.openstack.common import log as logging
38
39
from nova import paths
39
40
from nova import utils
170
171
        key_name = '%s%s' % (context.project_id, CONF.vpn_key_suffix)
171
172
        try:
172
173
            keypair_api = compute.api.KeypairAPI()
173
 
            result = keypair_api.create_key_pair(context,
174
 
                                                 context.user_id,
175
 
                                                 key_name)
176
 
            private_key = result['private_key']
 
174
            result, private_key = keypair_api.create_key_pair(context,
 
175
                                                              context.user_id,
 
176
                                                              key_name)
177
177
            key_dir = os.path.join(CONF.keys_path, context.user_id)
178
178
            fileutils.ensure_tree(key_dir)
179
179
            key_path = os.path.join(key_dir, '%s.pem' % key_name)