Updated openstack/openstack
Project: openstack/nova  69e6384674d8823fbccc1a291f26f95e6bbb11fe
null
Catch exception while building due to instance being deleted

In run_instance() a instance_update() call in _start_building() can
result in a UnexpectedDeletingTaskStateError if the instance gets
deleted while being built.Since this is an expected situation, we
don't want this exception written in the logs or worse, the instance
be set to error state. Instead catch this and raise a proper
BuildAbortException that gets handled above this call.

Change-Id: Ib9d3dd22b33b104f1593d534876a5387df81d11c
Closes-Bug: #1223843
Updated openstack/openstack
Project: openstack-dev/devstack  ed727dc6d94b31b66997010666a83a540d98ff88
null
Default to Cinder REST API v2

Set OS_VOLUME_API_VERSION environment variable to 2 so we use
specifically Cinder REST API v2. v1 is still enabled in the catalog, but
we want more exposure to v2 for testing.

Change-Id: I6c2f29edf44a0f58a7830fe4dd2db35f2db3658c