diff options
| author | Kevin L. Mitchell <kevin.mitchell@rackspace.com> | 2011-08-01 18:59:29 +0000 |
|---|---|---|
| committer | Kevin L. Mitchell <kevin.mitchell@rackspace.com> | 2011-08-01 18:59:29 +0000 |
| commit | 8e7a4e6147cb78b28fc2a2131591dbd37de2fa30 (patch) | |
| tree | 9ce06dbad2f46334761f6963ce7d5709b0c72712 /nova/virt | |
| parent | 1db6b5768a1160ee5e45ddadae7ba5c56b0abb4b (diff) | |
Revert hasattr() check on 'set_auth_token' for clients
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index c6320f917..6bbe6072c 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -465,8 +465,7 @@ class VMHelper(HelperBase): sr_ref = safe_find_sr(session) glance_client, image_id = nova.image.get_glance_client(image) - if hasattr(glance_client, 'set_auth_token'): - glance_client.set_auth_token(getattr(context, 'auth_token', None)) + glance_client.set_auth_token(getattr(context, 'auth_token', None)) meta, image_file = glance_client.get_image(image_id) virtual_size = int(meta['size']) vdi_size = virtual_size |