saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #39369 from rallytime/bp-37338

Browse source 
Back-port #37338 to 2016.11
This commit is contained in:
Mike Place 2017-02-13 14:41:18 -07:00 • committed by GitHub
commit 99554d9d72
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/modules/boto_rds.py
View file

@ -300,15 +300,15 @@ def create(name, allocated_storage, db_instance_class, engine,
log.info('Waiting 10 secs...')
sleep(10)
_describe = describe(name=name, tags=tags, region=region, key=key,
keyid=keyid, profile=profile)
keyid=keyid, profile=profile)['rds']
if not _describe:
return {'created': True}
if _describe['db_instance_status'] == wait_status:
if _describe['DBInstanceStatus'] == wait_status:
return {'created': True, 'message':
'Created RDS {0} with current status '
'{1}'.format(name, _describe['db_instance_status'])}
'{1}'.format(name, _describe['DBInstanceStatus'])}
log.info('Current status: {0}'.format(_describe['db_instance_status']))
log.info('Current status: {0}'.format(_describe['DBInstanceStatus']))
except ClientError as e:
return {'error': salt.utils.boto3.get_error(e)}
@ -551,7 +551,7 @@ def describe(name, tags=None, region=None, key=None, keyid=None,
'CopyTagsToSnapshot', 'MonitoringInterval',
'MonitoringRoleArn', 'PromotionTier',
'DomainMemberships')
return {'rds': dict([(k, rds.get(k)) for k in keys])}
return {'rds': dict([(k, rds.get('DBInstances', [{}])[0].get(k)) for k in keys])}
else:
return {'rds': None}
except ClientError as e: