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

Allow 'instance_name' (vs. 'instance_id') in route option to boto_vpc.route_table_present()

Browse Source
This commit is contained in:
Tom Williams 2015-10-04 16:38:55 -04:00
parent fe925920cf
commit cd4225b564
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
salt/states/boto_vpc.py
View File

@ -824,8 +824,8 @@ def _routes_present(route_table_name, routes, tags=None, region=None, key=None,
'changes': {}
}
route_table = __salt__['boto_vpc.describe_route_table'](route_table_name=route_table_name, tags=tags, region=region,
key=key, keyid=keyid, profile=profile)
route_table = __salt__['boto_vpc.describe_route_table'](route_table_name=route_table_name, tags=tags,
region=region, key=key, keyid=keyid, profile=profile)
if 'error' in route_table:
msg = 'Could not retrieve configuration for route table {0}: {1}`.'.format(route_table_name,
route_table['error']['message'])
@ -853,6 +853,15 @@ def _routes_present(route_table_name, routes, tags=None, region=None, key=None,
ret['result'] = False
return ret
_r['gateway_id'] = r['id']
if i.get('instance_name'):
r = __salt__['boto_ec2.get_id'](name=i['instance_name'], region=region,
key=key, keyid=keyid, profile=profile)
if r is None:
msg = 'Instance {0} does not exist.'.format(i['instance_name'])
ret['comment'] = msg
ret['result'] = False
return ret
_r['instance_id'] = r
_routes.append(_r)
to_delete = []