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

This commit is contained in:
Zuul 2019-10-29 23:16:38 +00:00 committed by Gerrit Code Review
commit a0498da856
2 changed files with 7 additions and 1 deletions

View File

@ -113,6 +113,11 @@ class ScaleDownAction(templates.ProcessTemplatesAction):
'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):

View File

@ -139,7 +139,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)