summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-02-08 00:05:06 +0000
committerGerrit Code Review <review@openstack.org>2012-02-08 00:05:06 +0000
commitb0a708f67407256a449414a000b070752e51dba2 (patch)
treed5634c4d17c2619ac7c3db888d82dbc1c58fe8e1
parentae0063057bd0db84c13e01b440ac923b7385d2d1 (diff)
parent4cad8add2085d8c2ca2ddcb4acb8d3662d609dee (diff)
downloadnova-b0a708f67407256a449414a000b070752e51dba2.tar.gz
nova-b0a708f67407256a449414a000b070752e51dba2.tar.xz
nova-b0a708f67407256a449414a000b070752e51dba2.zip
Merge "Send image properties to Glance"
-rwxr-xr-xplugins/xenserver/xenapi/etc/xapi.d/plugins/glance4
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
index 9f9e2686b..e53e4d5eb 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
@@ -343,6 +343,10 @@ def _upload_tarball(staging_path, image_id, glance_host, glance_port,
if auth_token:
headers['x-auth-token'] = auth_token
+ for key, value in properties.iteritems():
+ header_key = "x-image-meta-property-%s" % key.replace('_', '-')
+ headers[header_key] = str(value)
+
for header, value in headers.iteritems():
conn.putheader(header, value)
conn.endheaders()