Merge pull request #222 from dreamhost/stable/icehouse

Revert "Fetch a new token before router boots (to avoid token expiration...
This commit is contained in:
markmcclain 2015-03-23 17:12:12 -04:00
commit ecbf517a37
2 changed files with 0 additions and 4 deletions

View File

@ -46,8 +46,6 @@ class Nova(object):
# finally cleaned up.
LOG.debug('creating vm for router %s with image %s',
router.id, router_image_uuid)
self.client.client.unauthenticate()
self.client.client.authenticate()
server = self.client.servers.create(
'ak-' + router.id,
image=router_image_uuid,

View File

@ -92,8 +92,6 @@ class TestNovaWrapper(unittest.TestCase):
]
self.nova.create_router_instance(fake_router, 'GLANCE-IMAGE-123')
self.client.client.unauthenticate.assert_called_once()
self.client.client.authenticate.assert_called_once()
self.client.assert_has_calls(expected)
def test_get_instance(self):