openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Reset *RemovalPoliciesMode for node delete" into stable/train

This commit is contained in:
Zuul 2019-10-25 15:48:55 +00:00 committed by Gerrit Code Review
parent ba8e06ec90 9bc673fed3
commit 46af9e4cc1
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tripleo_common/actions/scale.py
View File

@ -118,6 +118,11 @@ class ScaleDownAction(base.TripleOAction):
'resource_list': [r.resource_name for r in role_resources]
}]
# force reset the removal_policies_mode to 'append'
# as 'update' can lead to deletion of unintended nodes.
removal_mode = "{0}RemovalPoliciesMode".format(role)
stack_params[removal_mode] = 'append'
return stack_params
def run(self, context):

3
tripleo_common/tests/actions/test_scale.py
View File

@ -140,7 +140,8 @@ class ScaleDownActionTest(base.TestCase):
template={'heat_template_version': '2016-04-30'}
)
clear_list = list(['ComputeCount', 'ComputeRemovalPolicies'])
clear_list = list(['ComputeCount', 'ComputeRemovalPolicies',
'ComputeRemovalPoliciesMode'])
_, kwargs = heatclient.stacks.update.call_args
self.assertEqual(set(kwargs['clear_parameters']), set(clear_list))
self.assertEqual(kwargs['environment'], env)