Updated openstack/openstack
Project: openstack/horizon  d32025858180fb62b4bcc27d5a43b08dfbb13faf
null
Fix wrong links to volume detail

instance detail page and stack mapping has wrong links
to volume details (They point to volume snapshot by mistake)

Change-Id: I2c067941034d6a75f5d99fc663fe07515705afe7
Closes-Bug: #1296356
Updated openstack/openstack
Project: openstack/nova  cb8de238efd24655fd5815d09b741dd0f0735f89
null
network_info cache should be cleared before being rescheduled

If an instance fails to boot due to a non-networking error the instance
then gets rescheduled and launched on another compute node. In these cases
deallocate_for_instance() is called which deletes the network ports
allocated though the info_cache for the instance is never cleared. This patch
adds a call to update_instance_cache_with_nw_info() which causes the cache
to get cleared out. Note: the cache is only cleared if the instance hasn't
been marked for deletion. This is due to how instance_info_cache_update()
is implemented.

Change-Id: If967884c9a6276f5949a7a04b597cedcce12ba09
Closes-bug: #1285158