Updated openstack/openstack
Project: openstack/nova  e6e0ee27e981154a75dd9f176981e1e3c85c4540
null
Add helper method to determine disk size from instance properties

Add a _disk_size_from_instance method which by using the disk name
determine the size of the disk refered in the instance properties.
Update the method finish_migration to use this new helper.

Change-Id: I45bd3804fdabff35189421d01a0503c886c24a4c
Related-Bug: #1298975
Updated openstack/openstack
Project: openstack-dev/devstack  b183a42994f8c700d347eb75d83e9ffb2feac880
null
Fix Sahara auth configs

* auth_ host/port/protocol should use corresponding $KEYSTONE_AUTH_
* add missed auth_ host/port/protocol to [keystone_authtoken]

Change-Id: I0fc6434d552cdd03eb8d886681e57bb374e5bb61