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

EC2 tags specified in CloudFormation should be applied to the instances (#840)

Browse source 
Fixes #839.
This commit is contained in:
Andy Freeland 2017-03-04 19:37:53 -08:00 • committed by Steve Pulec
commit a30ba2b597
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
moto/ec2/models.py
View file

@ -336,7 +336,7 @@ class NetworkInterfaceBackend(object):
return generic_filter(filters, enis)
class Instance(BotoInstance, TaggedEC2Resource):
class Instance(TaggedEC2Resource, BotoInstance):
def __init__(self, ec2_backend, image_id, user_data, security_groups, **kwargs):
super(Instance, self).__init__()
self.ec2_backend = ec2_backend
@ -441,7 +441,10 @@ class Instance(BotoInstance, TaggedEC2Resource):
key_name=properties.get("KeyName"),
private_ip=properties.get('PrivateIpAddress'),
)
return reservation.instances[0]
instance = reservation.instances[0]
for tag in properties.get("Tags", []):
instance.add_tag(tag["Key"], tag["Value"])
return instance
@property
def physical_resource_id(self):