x/gantt
Code Issues Proposed changes

Merge "Bug 820059: bin/nova-manage.py VpnCommands.spawn calls non-existant method VpnCommands._vpn_for - fixed"

Browse Source
This commit is contained in:
Jenkins
2011-12-29 18:44:19 +00:00
committed by Gerrit Code Review
parent 96c81d0e7a 470c2207fc
commit 828c543940
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bin/nova-manage
View File

@@ -88,6 +88,7 @@ from nova import rpc
from nova import utils from nova import utils
from nova import version from nova import version
from nova import vsa from nova import vsa
from nova.api.ec2 import admin
from nova.api.ec2 import ec2utils from nova.api.ec2 import ec2utils
from nova.auth import manager from nova.auth import manager
from nova.cloudpipe import pipelib from nova.cloudpipe import pipelib
@@ -174,8 +175,9 @@ class VpnCommands(object):
def spawn(self): def spawn(self):
"""Run all VPNs.""" """Run all VPNs."""
print "WARNING: This method only works with deprecated auth" print "WARNING: This method only works with deprecated auth"
ctxt = context.get_admin_context()
for p in reversed(self.manager.get_projects()): for p in reversed(self.manager.get_projects()):
if not self._vpn_for(p.id): if self._vpn_for(ctxt, p.id):
print 'spawning %s' % p.id print 'spawning %s' % p.id
self.pipe.launch_vpn_instance(p.id, p.project_manager_id) self.pipe.launch_vpn_instance(p.id, p.project_manager_id)
time.sleep(10) time.sleep(10)
@@ -211,6 +213,9 @@ class VpnCommands(object):
{'vpn_public_address': ip, {'vpn_public_address': ip,
'vpn_public_port': int(port)}) 'vpn_public_port': int(port)})
def _vpn_for(self, context, project_id):
return admin.AdminController()._vpn_for(context, project_id)
class ShellCommands(object): class ShellCommands(object):
def bpython(self): def bpython(self):