Set stack.thread_group_mgr for cancel_update
In change I84d2b34d65b3ce7d8d858de106dac531aff509b7, we changed to
call self._converge_create_or_update() in a sub-thread. However,
thread_group_mgr is not set for cancel_update (with rollback),
which in turn calls converge_stack.
This also enables test_cancel_update_server_with_port, as
bug #1607714 seems to be fixed now.
Change-Id: Ie674fd556418f6aa8e79654458cbe43648851db2
Closes-Bug: #1713952
(cherry picked from commit 3adca03db6
)
This commit is contained in:
parent
12c721c21c
commit
c44abd92d8
|
@ -1165,6 +1165,7 @@ class EngineService(service.ServiceBase):
|
|||
LOG.info('Starting cancel of updating stack %s', db_stack.name)
|
||||
|
||||
if current_stack.convergence:
|
||||
current_stack.thread_group_mgr = self.thread_group_mgr
|
||||
if cancel_with_rollback:
|
||||
func = current_stack.rollback
|
||||
else:
|
||||
|
|
|
@ -56,9 +56,8 @@ iniset $conf_file heat_plugin boot_config_env $DEST/heat-templates/hot/software-
|
|||
iniset $conf_file heat_plugin heat_config_notify_script $DEST/heat-agents/heat-config/bin/heat-config-notify
|
||||
iniset $conf_file heat_plugin minimal_image_ref cirros-0.3.5-x86_64-disk
|
||||
|
||||
# Skip test_cancel_update_server_with_port till bug #1607714 is fixed in nova
|
||||
# Skip ReloadOnSighupTest. Most jobs now run with apache+uwsgi, so the test has no significance
|
||||
iniset $conf_file heat_plugin skip_functional_test_list 'CancelUpdateTest.test_cancel_update_server_with_port, ReloadOnSighupTest'
|
||||
iniset $conf_file heat_plugin skip_functional_test_list 'ReloadOnSighupTest'
|
||||
|
||||
# Add scenario tests to skip
|
||||
# VolumeBackupRestoreIntegrationTest skipped until failure rate can be reduced ref bug #1382300
|
||||
|
|
Loading…
Reference in New Issue