Updated openstack/openstack
Project: openstack/python-ceilometerclient  5e4d9d38e703ad1c7a3d91330b3beaf244f7ccab

Avoid dead loop when token is string format

The token needs to be a callable object in http.Client, so we assign
a lambda expression to it when it is a string, but current implementation
will cause dead loop since it is x = lambda: x. This patch fixes it
and improves the corresponding test code.

Change-Id: Id41edd705b46196404e5cb3483a290074bde12d0
Closes-Bug: #1301877
Updated openstack/openstack
Project: openstack/horizon  2cec76b4dc52b107928c38977cbd1777a5b6629f

Avoid AttributeError: SecurityGroup error handle

On the project/access_and_security/security_groups/<detail> page, some
errors inside the
openstack_dashboard/dashboards/
project/access_and_security/security_groups/views
DetailView._get_data method are still resulting in a None being
returned. This causes an error in the DetailView.get_data method as
NoneTypes clearly don't have a .rules attribute.

I'm not sure why the error is sneaking through the exceptions.handle
above, but they most definitely are. Perhaps Ana Krivokapic's changes
here: https://review.openstack.org/#/c/84109/ may eventually solve this,
but it's unclear.

In the mean time, and potentially correct overall, if a None is
returned, the get_data method should return an empty list instead of
throwing an exception.

Change-Id: Ibc3bbb8c1302fca0c8a134abee8b7c649ad8c315
Closes-Bug: 1312192