diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-06-01 17:49:49 -0700 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-06-01 17:49:49 -0700 |
| commit | e0d2dde5d370d76cd8ff55e47dbbf749be43a4c9 (patch) | |
| tree | 9088f430aa5946c47273aceb3dc00d2b91760a26 /nova/api | |
| parent | cf464dc7f2093ea3d1f831915ce22f54f0d1c90a (diff) | |
| download | nova-e0d2dde5d370d76cd8ff55e47dbbf749be43a4c9.tar.gz nova-e0d2dde5d370d76cd8ff55e47dbbf749be43a4c9.tar.xz nova-e0d2dde5d370d76cd8ff55e47dbbf749be43a4c9.zip | |
tests all passing again
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/create_instance_controller.py | 5 | ||||
| -rw-r--r-- | nova/api/openstack/servers.py | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/api/openstack/create_instance_controller.py b/nova/api/openstack/create_instance_controller.py index edb1a5007..3a8bbb3c9 100644 --- a/nova/api/openstack/create_instance_controller.py +++ b/nova/api/openstack/create_instance_controller.py @@ -15,13 +15,14 @@ # License for the specific language governing permissions and limitations # under the License. +import base64 import re +import webob + from urlparse import urlparse from webob import exc from xml.dom import minidom -import webob - from nova import exception from nova import flags from nova import log as logging diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 2bfcbac81..e5b04db43 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -88,7 +88,6 @@ class Controller(controller.OpenstackCreateInstanceController): builder - the response model builder """ reservation_id = req.str_GET.get('reservation_id') - LOG.exception(_(" ************* RESERVATION ID %s"), reservation_id) instance_list = self.compute_api.get_all( req.environ['nova.context'], reservation_id=reservation_id) |