Updated openstack/openstack
Project: openstack/keystone  627141fe4534056d74d094078cef9d904c66c9fd
null
Fix using non-default default_domain_id

Changing the default_domain_id to something other than the
default would cause several operations to not work correctly.
This is because the value of default_domain_id was read and
cached in several parts on import, which is before the call to
CONF() so the cached value is the original default ('default')
rather than the value that the operator has in the config file.

This change removes the cached default_domain_id and instead
reads the value when it's needed at runtime so that the
user-configured value is used instead of the original default.

Change-Id: I9543e2108866ed66000d75f868bbd2b1ed978b97
Closes-Bug: #1265108
Updated openstack/openstack
Project: openstack/nova  9806635dca365f8f73a1de85e90c12fc5f02353c
null
Rename instance_type to flavor in vmware virt driver tests

Renames 'instance_type' to 'flavor' in the vmware virt driver tests.
There were no occurrences of 'instance_type' in the virt driver itself,
so this patch only changes the tests.

Part of blueprint flavor-instance-type-dedup

Change-Id: I81ea543e0ab480e35cf5b7b59bd9ecb1cf361c6f