catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

default eip domain to 'standard' for cloudformation creations

Browse source
This commit is contained in:
Joseph Lawson 2014-10-21 15:59:28 -04:00
commit d55a0b6ef0
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
moto/ec2/models.py
View file

@ -1949,11 +1949,12 @@ class ElasticAddress(object):
properties = cloudformation_json.get('Properties') properties = cloudformation_json.get('Properties')
instance_id = None instance_id = None
if properties: if properties:
domain=properties.get('Domain')
eip = ec2_backend.allocate_address( eip = ec2_backend.allocate_address(
domain=properties.get('Domain')) domain=domain if domain else 'standard')
instance_id = properties.get('InstanceId') instance_id = properties.get('InstanceId')
else: else:
eip = ec2_backend.allocate_address() eip = ec2_backend.allocate_address(domain='standard')
if instance_id: if instance_id:
instance = ec2_backend.get_instance_by_id(instance_id) instance = ec2_backend.get_instance_by_id(instance_id)