diff options
author | Jenkins <jenkins@review.openstack.org> | 2012-01-05 13:13:03 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2012-01-05 13:13:03 +0000 |
commit | 4df303b2f95e1eea1193e651b266b6ca5d5b8ded (patch) | |
tree | d6570d14da1ba8c9b2607363032209397b5cfc6c | |
parent | e60589016a8e66c06c07c41bc08bbc39509a2188 (diff) | |
parent | fc37582812747887ebcce766fd80541da98c3b43 (diff) | |
download | nova-4df303b2f95e1eea1193e651b266b6ca5d5b8ded.tar.gz |
Merge "Bug 820059: bin/nova-manage.py VpnCommands.spawn calls non-existant method VpnCommands._vpn_for - fixed" into stable/diablo
-rwxr-xr-x | bin/nova-manage | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index 45d649e5d1..f3aff19249 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -88,6 +88,7 @@ from nova import rpc from nova import utils from nova import version from nova import vsa +from nova.api.ec2 import admin from nova.api.ec2 import ec2utils from nova.auth import manager from nova.cloudpipe import pipelib @@ -175,8 +176,9 @@ class VpnCommands(object): def spawn(self): """Run all VPNs.""" print "WARNING: This method only works with deprecated auth" + ctxt = context.get_admin_context() 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 self.pipe.launch_vpn_instance(p.id, p.project_manager_id) time.sleep(10) @@ -212,6 +214,9 @@ class VpnCommands(object): {'vpn_public_address': ip, 'vpn_public_port': int(port)}) + def _vpn_for(self, context, project_id): + return admin.AdminController()._vpn_for(context, project_id) + class ShellCommands(object): def bpython(self): |