Updated openstack/openstack
Project: openstack/nova  e646ec54bd7729d33b32c7a18a1872fb2154a8c1

Only get image location attributes if including locations

Commit 155eeabbfafd4f48b47fea5b403f61a6e5c28426 added 'direct_url' and
'locations' to the list of attributes to get from an image which makes a
call back to glance if the attributes aren't on the image, and can
result in a 404 if they aren't available, which would be in the glance
v1 API case.

This change simply passes the new include_locations parameter down to
_extract_attributes so we can do the proper filtering.

Change-Id: I903fa5c781fed52183b340dc3d9bc4b6598b21ce
Partial-Bug: #1351333