summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorAnthony Young <sleepsonthefloor@gmail.com>2011-01-04 16:22:47 -0800
committerAnthony Young <sleepsonthefloor@gmail.com>2011-01-04 16:22:47 -0800
commit7c01430020ceabec765f388b70685808064cda3f (patch)
tree2d6760c96bd4e3b11408c2a497c882ccc9c64f8f /nova/api
parentee2d8a5bcdaf938b7047131d7809d1b6b3120b59 (diff)
downloadnova-7c01430020ceabec765f388b70685808064cda3f.tar.gz
nova-7c01430020ceabec765f388b70685808064cda3f.tar.xz
nova-7c01430020ceabec765f388b70685808064cda3f.zip
some more cleanup
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/admin.py1
-rw-r--r--nova/api/ec2/cloud.py2
2 files changed, 0 insertions, 3 deletions
diff --git a/nova/api/ec2/admin.py b/nova/api/ec2/admin.py
index e876724b1..fac01369e 100644
--- a/nova/api/ec2/admin.py
+++ b/nova/api/ec2/admin.py
@@ -183,4 +183,3 @@ class AdminController(object):
def describe_host(self, _context, name, **_kwargs):
"""Returns status info for single node."""
return host_dict(db.host_get(name))
-
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 20413e319..a59131ab5 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -774,8 +774,6 @@ class CloudController(object):
return self._format_run_instances(context,
instances[0]['reservation_id'])
- def run_instances2(self, context, **kwargs):
- return self.run_instances(context, kwargs)
def terminate_instances(self, context, instance_id, **kwargs):
"""Terminate each instance in instance_id, which is a list of ec2 ids.
instance_id is a kwarg so its name cannot be modified."""