Updated openstack/openstack
Project: openstack/python-heatclient  e259163d5632188065b2ad4bbb2065d4fd5fc91d
null
Revert "Don't call credentials_headers() twice"

When we create or update a stack, when deferred_auth_method=password
(which is the default in heat.conf), the client must pass the username
and password, even if they don't need to for authentication (ie
they're passing a token). Otherwise there's no username and password
in the context to store, and the engine validation in
heat/engine/service.py::_validate_deferred_auth_context fails.

No such issue exists when deferred_auth_method=trusts, which is why
this problem was missed during testing of the patch being reverted.

Note some fixup in addition to the revert was required to make the
tests pass, as ShellTestToken and ShellTestStandaloneToken now require
username/password set in the fake env.

This reverts commit a7ba3c323b16227e0ba2527f21bc89625f125234
Change-Id: I0e7bc3f748022c2bf5ef7ef6dfe4d97953e3fcab
Updated openstack/openstack
Project: openstack/nova  85915c4c3a74482adf73dafaf1b45193c48237c3
null
Fix "in" comparisons with one element tuples

A single value enclosed in parentheses is not a tuple (it needs a comma
after the element) therefore the comparisons like 'if foo in ("bar")'
are wrong.

Closes-Bug: #1248443
Change-Id: I29a2227c9d83efc17ecfacc86d507d75edd4eaca