Merge trunk to resolve nova/network/linux_net.py conflict

1 files changed, 5 insertions, 1 deletions

diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
index a06312890..1a9ac37e9 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
@@ -252,7 +252,11 @@ def _upload_tarball(staging_path, image_id, glance_host, glance_port, os_type,
     # NOTE(dprince): We need to resend any existing Glance meta/property
     # headers so they are preserved in Glance. We obtain them here with a
     # HEAD request.
-    conn.request('HEAD', '/v1/images/%s' % image_id)
+    conn.putrequest('HEAD', '/v1/images/%s' % image_id)
+    if auth_token:
+        conn.putheader('x-auth-token', auth_token)
+        conn.endheaders()
+
     resp = conn.getresponse()
     if resp.status != httplib.OK:
         raise Exception("Unexpected response from Glance %i" % resp.status)