Updated openstack/openstack
Project: openstack/nova  cc3aff85b5bda8b96ab9ac604620c15374ff5378

Move the instance_type_id judgment to the except-block

If the instance types are not stashed, will fallback to the
conductor API to retrieve them. So the instance_type_id is
only used in except-block.

Change-Id: If45eb01dd8292e87eda6516cd79c94fb7f6005fb