From 62d5fae8d11b6403f9a63a709270ffafebb7ef09 Mon Sep 17 00:00:00 2001 From: Jesse Andrews Date: Tue, 31 Jan 2012 16:29:28 -0600 Subject: remove unsupported ec2 extensions implements blueprint remove-ec2-extensions * remove deprecated unofficial ec2 admin api * remove admin api from wsgi/paste * remove unofficial ec2 call for ajaxterm / update calls * remove displayName/displayDescription from volumes/instances Change-Id: If5a5ae26ebb9456a3c7376ff4ff0aa9589be1f5b --- bin/nova-manage | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/nova-manage b/bin/nova-manage index 1275d72d9..69a293ce1 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -89,11 +89,11 @@ 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 from nova.compute import instance_types +from nova.compute import vm_states from nova.db import migration from nova.volume import volume_types @@ -214,7 +214,11 @@ class VpnCommands(object): 'vpn_public_port': int(port)}) def _vpn_for(self, context, project_id): - return admin.AdminController()._vpn_for(context, project_id) + """Get the VPN instance for a project ID.""" + for instance in db.instance_get_all_by_project(context, project_id): + if (instance['image_id'] == str(FLAGS.vpn_image_id) + and not instance['vm_state'] in [vm_states.DELETED]): + return instance class ShellCommands(object): -- cgit