Ignore resource_data decryption errors

If the auth_encryption_key changes We can possibly
ignore these errors when deleting stacks.

Task: 42056
Change-Id: I326e415db194a5b9c67acd038d7d2d993293ecb3
(cherry picked from commit 9407b4897e)
(cherry picked from commit af617facc5)
(cherry picked from commit 83a983678c)
(cherry picked from commit b135a99575)
This commit is contained in:
ramishra 2021-03-16 12:19:26 +05:30 committed by Takashi Kajinami
parent 8d609ba98c
commit 23a6768ab1
1 changed files with 8 additions and 3 deletions

View File

@ -385,9 +385,14 @@ def resource_data_get_all(context, resource_id, data=None):
for res in data:
if res.redact:
ret[res.key] = crypt.decrypt(res.decrypt_method, res.value)
else:
ret[res.key] = res.value
try:
ret[res.key] = crypt.decrypt(res.decrypt_method, res.value)
continue
except exception.InvalidEncryptionKey:
LOG.exception('Failed to decrypt resource data %(rkey)s '
'for %(rid)s, ignoring.',
{'rkey': res.key, 'rid': resource_id})
ret[res.key] = res.value
return ret