openstack
/
heat
Code Issues Proposed changes

Merge "Set stack.thread_group_mgr for cancel_update"

This commit is contained in:
Zuul 2017-11-07 16:26:56 +00:00 committed by Gerrit Code Review
parent ca8a316458 3adca03db6
commit 2ca8d4f456
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
heat/engine/service.py
View File

@ -1163,6 +1163,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:

3
heat_integrationtests/prepare_test_env.sh
View File

@ -56,10 +56,9 @@ iniset $conf_file heat_plugin boot_config_env $DEST/heat-templates/hot/software-
iniset $conf_file heat_plugin heat_config_notify_script $DEST/heat-templates/hot/software-config/elements/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
# Skip NotificationTest till bug #1721202 is fixed
iniset $conf_file heat_plugin skip_functional_test_list 'CancelUpdateTest.test_cancel_update_server_with_port, ReloadOnSighupTest, NotificationTest'
iniset $conf_file heat_plugin skip_functional_test_list 'ReloadOnSighupTest, NotificationTest'
# Add scenario tests to skip
# VolumeBackupRestoreIntegrationTest skipped until failure rate can be reduced ref bug #1382300