openstack
/
murano
Code Issues Proposed changes

Merge "Increase default timeout for agents response to 1 hour"

This commit is contained in:
Jenkins 2015-06-14 21:18:14 +00:00 committed by Gerrit Code Review
parent 52dbfafb5c 700a7cb37c
commit 0f16212c9a
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
murano/common/config.py
View File

@ -201,7 +201,10 @@ engine_opts = [
help=_("Create resources using trust token rather "
"than user's token")),
cfg.BoolOpt('enable_model_policy_enforcer', default=False,
help=_('Enable model policy enforcer using Congress'))
help=_('Enable model policy enforcer using Congress')),
cfg.IntOpt('agent_timeout', default=3600,
help=_('Time for waiting for a response from murano agent'
'during the deployment'))
]
# TODO(sjmc7): move into engine opts?

10
murano/engine/system/agent.py
View File

@ -22,6 +22,7 @@ import urlparse
import uuid
import eventlet.event
from oslo_config import cfg
import murano.common.config as config
import murano.common.exceptions as exceptions
@ -32,6 +33,7 @@ import murano.dsl.yaql_expression as yaql_expression
import murano.engine.system.common as common
LOG = logging.getLogger(__name__)
CONF = cfg.CONF
class AgentException(Exception):
@ -121,7 +123,9 @@ class Agent(murano_object.MuranoObject):
else:
return None
def call(self, template, resources, _context, timeout=600):
def call(self, template, resources, _context, timeout=None):
if timeout is None:
timeout = CONF.engine.agent_timeout
self._check_enabled()
plan = self.buildExecutionPlan(template, resources)
return self._send(plan, True, timeout, _context)
@ -131,7 +135,9 @@ class Agent(murano_object.MuranoObject):
plan = self.buildExecutionPlan(template, resources)
return self._send(plan, False, 0, _context)
def callRaw(self, plan, _context, timeout=600):
def callRaw(self, plan, _context, timeout=None):
if timeout is None:
timeout = CONF.engine.agent_timeout
self._check_enabled()
return self._send(plan, True, timeout, _context)