From 21da183edee9c8f8ddf0ff6a880486c0ed2e4623 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Tue, 27 Sep 2011 08:58:54 -0400 Subject: [PATCH] Make sure options is set before checking managed_disk setting. Fixes bug 860520. Change-Id: I83c6c1cdb8e11959d6af5c08827e9f9ce82a5913 --- plugins/xenserver/xenapi/etc/xapi.d/plugins/glance | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance index bb3737a65a1..1dc0f86e9b7 100755 --- 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