Make sure options is set before checking managed_disk setting. Fixes …

…bug 860520. Change-Id: I83c6c1cdb8e11959d6af5c08827e9f9ce82a5913
openstack · Sep 27, 2011 · 21da183 · 21da183
1 parent a515337
commit 21da183
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
@@ -293,7 +293,7 @@ def _upload_tarball(staging_path, image_id, glance_host, glance_port, os_type,
         'x-image-meta-container-format': 'ovf',
         'x-image-meta-property-os-type': os_type}
 
-    if options.get('managed_disk'):
+    if options and options.get('managed_disk'):
         headers['x-image-meta-property-managed-disk'] = options['managed_disk']
 
     # If we have an auth_token, set an x-auth-token header