openstack
/
fuel-web
Code Issues Proposed changes

Add check for active deployment 

* Check for active `deployment` and `provision` tasks
   when running new deployment

Change-Id: I489c6444cd6822cd0b08b074edf420e66014f0f8
Closes-Bug: #1539693
(cherry picked from commit 5853b90e8a)
This commit is contained in:
Fedor Zhadaev 2016-02-02 17:40:41 +03:00
parent 043fa47d93
commit 0ad55bf168
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nailgun/nailgun/task/manager.py
View File

@ -107,9 +107,11 @@ class TaskManager(object):
class DeploymentCheckMixin(object):
# A list of tasks which we cannot run at the same cluster in parallel
# A list of tasks which prevent to start new deploy process
deployment_tasks = (
consts.TASK_NAMES.deploy,
consts.TASK_NAMES.deployment,
consts.TASK_NAMES.provision,
consts.TASK_NAMES.stop_deployment,
consts.TASK_NAMES.reset_environment,
# NOTE(eli): Node deletion may require nodes redeployment

3
nailgun/nailgun/test/integration/test_task_managers.py
View File

@ -593,7 +593,8 @@ class TestTaskManagers(BaseIntegrationTest):
cluster = self.env.create_cluster(api=True)
cluster_id = cluster['id']
manager_ = manager.ApplyChangesTaskManager(cluster_id)
task = models.Task(name='provision', cluster_id=cluster_id)
task = models.Task(name='provision', cluster_id=cluster_id,
status=consts.TASK_STATUSES.ready)
self.db.add(task)
self.db.commit()
rpc.receiver.NailgunReceiver.deploy_resp(nodes=[