Merge "Update requirements due to global-requirements"
This commit is contained in:
commit
bb0cf897f4
@ -33,7 +33,7 @@ class DefaultExecutor(executor.Executor):
|
||||
def _log_action_exception(self, message, task, exc):
|
||||
LOG.exception("%s [task_id=%s, action='%s', action_spec='%s']\n %s" %
|
||||
(message, task['id'], task['task_spec']['action'],
|
||||
task['action_spec'], exc))
|
||||
task['action_spec'], exc))
|
||||
|
||||
def _do_task_action(self, task):
|
||||
"""Executes the action defined by the task and return result.
|
||||
@ -48,7 +48,7 @@ class DefaultExecutor(executor.Executor):
|
||||
|
||||
action = a_f.create_action(task)
|
||||
|
||||
#TODO(dzimine): on failure, convey failure details back
|
||||
# TODO(dzimine): on failure, convey failure details back
|
||||
|
||||
if action.is_sync():
|
||||
try:
|
||||
@ -73,8 +73,9 @@ class DefaultExecutor(executor.Executor):
|
||||
:param exception: an exception thrown during the execution of the task
|
||||
:type exception: Exception
|
||||
"""
|
||||
#TODO(dzimine): why exception is a parameter here?
|
||||
#TODO(dzimine): convey exception details to end user (why task failed?)
|
||||
# TODO(dzimine): why exception is a parameter here?
|
||||
# TODO(dzimine): convey exception details to end user
|
||||
# (why task failed?)
|
||||
try:
|
||||
db_api.start_tx()
|
||||
try:
|
||||
|
@ -52,7 +52,7 @@ def find_resolved_tasks(tasks):
|
||||
for t in tasks:
|
||||
deps = t.get('requires', [])
|
||||
if len(set(deps) - allow_set) == 0:
|
||||
# all required tasks, if any, are SUCCESS
|
||||
# all required tasks, if any, are SUCCESS
|
||||
if t['state'] == states.IDLE:
|
||||
resolved_tasks.append(t)
|
||||
elif t['state'] == states.DELAYED:
|
||||
|
@ -222,8 +222,8 @@ class ActionFactoryTest(base.BaseTest):
|
||||
'project_id': '321'
|
||||
}
|
||||
})
|
||||
## In case of no-adhoc action we should evaluate task parameters
|
||||
## to see what we need.
|
||||
# In case of no-adhoc action we should evaluate task parameters
|
||||
# to see what we need.
|
||||
task_spec = db_task['task_spec']
|
||||
task_spec['parameters'] = {
|
||||
'url': "http://some/{$.openstack.project_id}/servers",
|
||||
|
@ -11,13 +11,13 @@ posix_ipc
|
||||
croniter>=0.3.4 # MIT License
|
||||
requests>=1.1
|
||||
kombu>=2.4.8
|
||||
oslo.config>=1.2.0
|
||||
oslo.config>=1.2.1
|
||||
oslo.messaging>=1.3.0
|
||||
oslotest
|
||||
paramiko>=1.9.0
|
||||
python-keystoneclient>=0.7.0
|
||||
paramiko>=1.13.0
|
||||
python-keystoneclient>=0.9.0
|
||||
networkx>=1.8
|
||||
six>=1.6.0
|
||||
SQLAlchemy>=0.7.8,<=0.9.99
|
||||
six>=1.7.0
|
||||
SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
|
||||
stevedore>=0.14
|
||||
yaql==0.2.1 # This is not in global requirements
|
||||
|
@ -1,10 +1,8 @@
|
||||
hacking>=0.8.0,<0.9
|
||||
hacking>=0.9.2,<0.10
|
||||
coverage>=3.6
|
||||
pep8==1.4.5
|
||||
pyflakes>=0.7.2,<0.7.4
|
||||
flake8==2.0
|
||||
pyflakes==0.8.1
|
||||
pylint==0.25.2
|
||||
sphinx>=1.1.2
|
||||
sphinx>=1.1.2,!=1.2.0,<1.3
|
||||
unittest2
|
||||
oslosphinx
|
||||
sphinxcontrib-pecanwsme>=0.8
|
||||
@ -15,4 +13,4 @@ mock>=1.0
|
||||
nose
|
||||
testrepository>=0.0.18
|
||||
testtools>=0.9.34
|
||||
lockfile>=0.9.1
|
||||
lockfile>=0.8
|
||||
|
Loading…
Reference in New Issue
Block a user