openstack
/
instack-undercloud
Code Issues Proposed changes

Merge "Stop using deprecated create_default_deployment_plan workflow"

This commit is contained in:
Zuul 2017-10-17 18:09:26 +00:00 committed by Gerrit Code Review
parent 0df50b7eae 83db861aae
commit 3fe99d45a8
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
instack_undercloud/tests/test_undercloud.py
View File

@ -827,10 +827,11 @@ class TestPostConfig(base.BaseTestCase):
undercloud._create_default_plan(mock_mistral, [])
mock_mistral.executions.create.assert_called_once_with(
'tripleo.plan_management.v1.create_default_deployment_plan',
'tripleo.plan_management.v1.create_deployment_plan',
workflow_input={
'container': 'overcloud',
'queue_name': mock.ANY
'queue_name': mock.ANY,
'use_default_templates': True,
}
)

8
instack_undercloud/undercloud.py
View File

@ -1586,8 +1586,12 @@ def _create_default_plan(mistral, plans, timeout=360):
return
execution = mistral.executions.create(
'tripleo.plan_management.v1.create_default_deployment_plan',
workflow_input={'container': plan_name, 'queue_name': queue_name}
'tripleo.plan_management.v1.create_deployment_plan',
workflow_input={
'container': plan_name,
'queue_name': queue_name,
'use_default_templates': True,
}
)
timeout_at = time.time() + timeout
fail_message = ("error creating the default Deployment Plan %s "