diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-09-27 08:58:54 -0400 |
|---|---|---|
| committer | Dan Prince <dan.prince@rackspace.com> | 2011-09-27 08:58:54 -0400 |
| commit | 21da183edee9c8f8ddf0ff6a880486c0ed2e4623 (patch) | |
| tree | 31f99e60d81bf370a2d5ff073008a1ee4bf79a64 /plugins | |
| parent | a51533729a262be258f99b0c5669eed78981eba5 (diff) | |
| download | nova-21da183edee9c8f8ddf0ff6a880486c0ed2e4623.tar.gz nova-21da183edee9c8f8ddf0ff6a880486c0ed2e4623.tar.xz nova-21da183edee9c8f8ddf0ff6a880486c0ed2e4623.zip | |
Make sure options is set before checking managed_disk setting. Fixes bug 860520.
Change-Id: I83c6c1cdb8e11959d6af5c08827e9f9ce82a5913
Diffstat (limited to 'plugins')
| -rwxr-xr-x | plugins/xenserver/xenapi/etc/xapi.d/plugins/glance | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance index bb3737a65..1dc0f86e9 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 |