Updated openstack/openstack
Project: openstack/ceilometer  39f13fa706e79f1d56694d1c027b0f808ed5a68e
null
check domain state before inspecting nics/disks

If there are shutoff instances,the ceilometer-inspector vill
inspect faild,and record the tedious error string in log.
The inspector of ceilometer should check the domain state before
inspecting nics and disks,and record more conciser log message in log file.

Change-Id: Id56bf75b47edf1f3b4ba77f40a48d83186d0afb6
Closes-bug: #1271454
Updated openstack/openstack
Project: openstack/tempest  3220f892696dfd48111499cf281df2c65077c90a
null
Make v2 and v3 identity apis configurable

This commit adds a config option to the identity feature enabled group
to specify whether the v2 and/or v3 apis are enabled in keystone. In
the process of adding this feature the logical split between v2 and v3
tests in the identity api tests is made more clear. Additionally as part,
of the split several bugs are fixed where the v2 api was being called
in the v3 tests.

Change-Id: I0d727f3567c82fe512b956110bb813119ced0b3d