Updated openstack/openstack
Project: openstack/nova  2adde1b7f4ec898911815c701fd6cc34d371f905
null
Move consoleauth_manager option into nova.service and fix imports

Moves the consoleauth_manager option into nova.service like the other
manager options in commit 39ce4032.

The thinking for having it in nova.service is that's where
CONF.get('%_manager'...) is called.  It also makes no sense for the
option to be declared in nova.consoleauth.manager because if you change
this config option, then you don't want nova.consoleauth.manager loaded.

Closes-Bug: #1276398

Change-Id: I85e089239228920e9e58284cf6ff52e43bf85ab0
Updated openstack/openstack
Project: openstack/cinder  27627631d4a0a477570b6f8b1bf17cd772208d72
null
Fix race in test_delete_backup

Unit test sporadically failed due to timing issue - the deletion
timestamp on the backup was exactly the same as timeutils.utcnow(),
causing the AssertGreater check to fail.  Change to AssertGreaterEqual.

Change-Id: Ia66d0d4bdae3242780a91f0d384cbd17caa8c197
Closes-bug: #1284227