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

fix boto_rds.describe

Browse source
This commit is contained in:
Rudy Attias 2016-11-24 18:03:04 +02:00
parent ddd88ba047
commit 166c42bc51
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/modules/boto_rds.py
View file

@ -256,7 +256,7 @@ def create(name, allocated_storage, db_instance_class, engine,
raise SaltInvocationError('master_username is required')
if not master_user_password:
raise SaltInvocationError('master_user_password is required')
if availability_zone and MultiAZ:
if availability_zone and multi_az:
raise SaltInvocationError('availability_zone and multi_az are mutually'
' exclusive arguments.')
if wait_status:
@ -529,6 +529,10 @@ def describe(name, tags=None, region=None, key=None, keyid=None,
return {'results': bool(conn)}
rds = conn.describe_db_instances(DBInstanceIdentifier=name)
rds = [
i for i in rds.get('DBInstances', [])
if i.get('DBInstanceIdentifier') == name
].pop(0)
if rds:
keys = ('DBInstanceIdentifier', 'DBInstanceClass', 'Engine',
@ -549,7 +553,8 @@ def describe(name, tags=None, region=None, key=None, keyid=None,
return {'rds': None}
except ClientError as e:
return {'error': salt.utils.boto3.get_error(e)}
except IndexError:
return {'rds': None}
def get_endpoint(name, tags=None, region=None, key=None, keyid=None,
profile=None):