This commit is contained in:
Sandy Walsh
2011-09-12 09:29:08 -07:00

View File

@@ -154,10 +154,10 @@ def child_zone_helper(context, zone_list, func):
be whatever the response from server.pause() is. One entry be whatever the response from server.pause() is. One entry
per child zone called.""" per child zone called."""
def _wrap_method(function, arg1): def _wrap_method(function, arg1, arg2):
"""Wrap method to supply an argument.""" """Wrap method to supply an argument."""
def _wrap(*args, **kwargs): def _wrap(*args, **kwargs):
return function(arg1, *args, **kwargs) return function(arg1, arg2, *args, **kwargs)
return _wrap return _wrap
def _process(func, context, zone): def _process(func, context, zone):
@@ -165,7 +165,8 @@ def child_zone_helper(context, zone_list, func):
an authenticated nova client and zone info.""" an authenticated nova client and zone info."""
try: try:
nova = novaclient.Client(zone.username, zone.password, None, 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() nova.authenticate()
except novaclient_exceptions.BadRequest, e: except novaclient_exceptions.BadRequest, e:
url = zone.api_url url = zone.api_url