← Back to branch summary

~ttx/nova/d4-merge

« back to all changes in this revision

Viewing changes to nova/api/ec2/admin.py

  • Committer: Thierry Carrez
  • Date: 2011-08-23 12:23:07 UTC
  • mfrom: (1130.75.258 nova)
  • Revision ID: thierry@openstack.org-20110823122307-f0vtuyg1ikc14n87
Merge diablo-4 development from trunk (rev1479)

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/ec2/admin.py
283
283
            # NOTE(vish) import delayed because of __init__.py
284
284
            from nova.cloudpipe import pipelib
285
285
            pipe = pipelib.CloudPipe()
 
286
            proj = manager.AuthManager().get_project(project)
 
287
            user_id = proj.project_manager_id
286
288
            try:
287
 
                pipe.launch_vpn_instance(project)
 
289
                pipe.launch_vpn_instance(project, user_id)
288
290
            except db.NoMoreNetworks:
289
291
                raise exception.ApiError("Unable to claim IP for VPN instance"
290
292
                                         ", ensure it isn't running, and try "