Updated openstack/openstack
Project: openstack/keystone  16652ae06b170fabf882bcb9581961113629f61b
null
Sync oslo strutils.py

Update openstack/common/strutils.py, which pulls in these commits:
e53fe85 strutils bool_from_string, allow specified default
84d461e Fix a bug in safe_encode where it returns a bytes object in py3

Change-Id: I91d0dbaf40db57d37be170f12c2ef455f0aeb887
Updated openstack/openstack
Project: openstack/tempest  640629f6ab9cbab64003353c7ba0cd5de238c6df
null
Catch ssh exception and detach in min scenario

The test_minimum_basic test goes through a number of tests however
doesn't do any clean up if a failur occurs.  The master clean-up
routine is ok, but it doesn't account for things like attached volumes.

One issue here is that the ssh_to_server times out do to some other
problem and raises an SSHTimeout exception.  This exception isn't dealt
with, the test dumps out and tries to cleanup by deleting the instance
and the volume, but the volume-delete will fail because it's status is
still in-use.

This exposes another problem, it seems that nova delete will clean up
an instance but fairly regular neglect to detach the volume. This patch
add an addCleanup() call to nova.volume_detach.

Change-Id: I76d19f096d6cb4122eea2e7e5de4eb37b97a4b87
Partial-Bug: #1213215