summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-09-12 09:29:08 -0700
committerSandy Walsh <sandy.walsh@rackspace.com>2011-09-12 09:29:08 -0700
commit5c5948ffe158d9834d13a80a3ff4e73f79d0d7e0 (patch)
tree275059cfe3205e4eea68496b4865e3c40bb84325
parent043a13690dc4f2ba20965cced85d705e59f7406b (diff)
parent6299edf0f240d46b3de1de4bf89f839b5737a7f2 (diff)
downloadnova-5c5948ffe158d9834d13a80a3ff4e73f79d0d7e0.tar.gz
nova-5c5948ffe158d9834d13a80a3ff4e73f79d0d7e0.tar.xz
nova-5c5948ffe158d9834d13a80a3ff4e73f79d0d7e0.zip
fixups
-rw-r--r--nova/scheduler/api.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/scheduler/api.py b/nova/scheduler/api.py
index 6c5118751..3d92d902a 100644
--- a/nova/scheduler/api.py
+++ b/nova/scheduler/api.py
@@ -154,10 +154,10 @@ def child_zone_helper(context, zone_list, func):
be whatever the response from server.pause() is. One entry
per child zone called."""
- def _wrap_method(function, arg1):
+ def _wrap_method(function, arg1, arg2):
"""Wrap method to supply an argument."""
def _wrap(*args, **kwargs):
- return function(arg1, *args, **kwargs)
+ return function(arg1, arg2, *args, **kwargs)
return _wrap
def _process(func, context, zone):
@@ -165,7 +165,8 @@ def child_zone_helper(context, zone_list, func):
an authenticated nova client and zone info."""
try:
nova = novaclient.Client(zone.username, zone.password, None,
- zone.api_url, token=context.auth_token)
+ zone.api_url, region_name=zone.name,
+ token=context.auth_token)
nova.authenticate()
except novaclient_exceptions.BadRequest, e:
url = zone.api_url