openstack
/
instack-undercloud
Code Issues Proposed changes

Merge "Bump default plan creation timeout" into stable/queens

This commit is contained in:
Zuul 2019-09-06 23:07:56 +00:00 committed by Gerrit Code Review
parent 97b77d1d13 d81c12015e
commit 1910a4b06b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
instack_undercloud/tests/test_undercloud.py
View File

@ -1502,7 +1502,8 @@ class TestPostConfig(BaseTestCase):
'/bar.yaml')],
mock_mistral.workbooks.create.mock_calls)
mock_cmce.assert_called_once_with(instack_env, mock_mistral)
mock_create.assert_called_once_with(mock_mistral, ['hut8'])
mock_create.assert_called_once_with(mock_mistral, ['hut8'],
timeout=1200)
@mock.patch('os.path.isfile', return_value=True)
@mock.patch('os.listdir')
@ -1547,7 +1548,8 @@ class TestPostConfig(BaseTestCase):
'/bar.yaml')],
mock_mistral.workbooks.create.mock_calls)
mock_cmce.assert_called_once_with(instack_env, mock_mistral)
mock_create.assert_called_once_with(mock_mistral, ['hut8'])
mock_create.assert_called_once_with(mock_mistral, ['hut8'],
timeout=1200)
def _neutron_mocks(self):
mock_sdk = mock.MagicMock()

2
instack_undercloud/undercloud.py
View File

@ -2069,7 +2069,7 @@ def _post_config_mistral(instack_env, mistral, swift):
plans = [container["name"] for container in swift.get_account()[1]]
_create_mistral_config_environment(instack_env, mistral)
_create_default_plan(mistral, plans)
_create_default_plan(mistral, plans, timeout=1200)
_create_logging_cron(mistral)
if CONF.enable_validations: