valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #34467 from rallytime/bp-34457

Browse Source 
Back-port #34457 to 2015.8
This commit is contained in:
Mike Place 2016-07-05 21:56:58 -06:00 committed by GitHub
commit 85f1f18239
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/states/boto_kms.py
View File

@ -179,14 +179,14 @@ def _key_present(
rc = __salt__['boto_kms.create_key'](
policy, description, key_usage, region, key, keyid, profile
)
key_metadata = rc['key_metadata']
kms_key_id = key_metadata['KeyId']
if 'error' in rc:
ret['result'] = False
ret['comment'] = 'Failed to create key: {0}'.format(
rc['error']['message']
)
return ret
key_metadata = rc['key_metadata']
kms_key_id = key_metadata['KeyId']
rn = __salt__['boto_kms.create_alias'](
alias, kms_key_id, region, key, keyid, profile
)
@ -207,13 +207,13 @@ def _key_present(
rd = __salt__['boto_kms.describe_key'](
alias, region, key, keyid, profile
)
key_metadata = rd['key_metadata']
if 'error' in rd:
ret['result'] = False
ret['comment'] = 'Failed to update key: {0}.'.format(
rd['error']['message']
)
return ret
key_metadata = rd['key_metadata']
_ret = _key_description(
key_metadata, description, region, key, keyid, profile
)