Browse Source

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

tags/8.4.9^0
Zuul 2 weeks ago
parent
commit
1910a4b06b
2 changed files with 5 additions and 3 deletions
  1. 4
    2
      instack_undercloud/tests/test_undercloud.py
  2. 1
    1
      instack_undercloud/undercloud.py

+ 4
- 2
instack_undercloud/tests/test_undercloud.py View File

@@ -1502,7 +1502,8 @@ class TestPostConfig(BaseTestCase):
1502 1502
                                    '/bar.yaml')],
1503 1503
                          mock_mistral.workbooks.create.mock_calls)
1504 1504
         mock_cmce.assert_called_once_with(instack_env, mock_mistral)
1505
-        mock_create.assert_called_once_with(mock_mistral, ['hut8'])
1505
+        mock_create.assert_called_once_with(mock_mistral, ['hut8'],
1506
+                                            timeout=1200)
1506 1507
 
1507 1508
     @mock.patch('os.path.isfile', return_value=True)
1508 1509
     @mock.patch('os.listdir')
@@ -1547,7 +1548,8 @@ class TestPostConfig(BaseTestCase):
1547 1548
                                    '/bar.yaml')],
1548 1549
                          mock_mistral.workbooks.create.mock_calls)
1549 1550
         mock_cmce.assert_called_once_with(instack_env, mock_mistral)
1550
-        mock_create.assert_called_once_with(mock_mistral, ['hut8'])
1551
+        mock_create.assert_called_once_with(mock_mistral, ['hut8'],
1552
+                                            timeout=1200)
1551 1553
 
1552 1554
     def _neutron_mocks(self):
1553 1555
         mock_sdk = mock.MagicMock()

+ 1
- 1
instack_undercloud/undercloud.py View File

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

Loading…
Cancel
Save