From 0f8976fb18151f60b5a5936f21154cd902650d34 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Thu, 15 Oct 2015 20:35:43 +0000 Subject: [PATCH] resync tests/charmhelpers --- tests/charmhelpers/contrib/openstack/amulet/deployment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/charmhelpers/contrib/openstack/amulet/deployment.py b/tests/charmhelpers/contrib/openstack/amulet/deployment.py index dd81e4db..f9304d45 100644 --- a/tests/charmhelpers/contrib/openstack/amulet/deployment.py +++ b/tests/charmhelpers/contrib/openstack/amulet/deployment.py @@ -152,7 +152,7 @@ class OpenStackAmuletDeployment(AmuletDeployment): services = list(set(self.d.services.keys()) - set(exclude_services)) service_messages = {service: message for service in services} - self.d.sentry.wait_for_messages(service_messages, timeout=900) + self.d.sentry.wait_for_messages(service_messages, timeout=timeout) def _get_openstack_release(self): """Get openstack release.