Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed terraform deploy against moto fails (#857)

Browse Source
This commit is contained in:
Christian Hellman 2017-03-12 09:40:49 -07:00 committed by Steve Pulec
parent b2a360aaf7
commit c271e31745
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
moto/ec2/models.py
View File

@ -369,6 +369,7 @@ class Instance(TaggedEC2Resource, BotoInstance):
self.key_name = kwargs.get("key_name") self.key_name = kwargs.get("key_name")
self.source_dest_check = "true" self.source_dest_check = "true"
self.launch_time = utc_date_and_time() self.launch_time = utc_date_and_time()
self.disable_api_termination = kwargs.get("disable_api_termination", False)
associate_public_ip = kwargs.get("associate_public_ip", False) associate_public_ip = kwargs.get("associate_public_ip", False)
if in_ec2_classic: if in_ec2_classic:
# If we are in EC2-Classic, autoassign a public IP # If we are in EC2-Classic, autoassign a public IP

4
moto/ec2/responses/instances.py
View File

@ -297,7 +297,7 @@ EC2_RUN_INSTANCES = """<RunInstancesResponse xmlns="http://ec2.amazonaws.com/doc
<attachmentId>{{ nic.attachment_id }}</attachmentId> <attachmentId>{{ nic.attachment_id }}</attachmentId>
<deviceIndex>{{ nic.device_index }}</deviceIndex> <deviceIndex>{{ nic.device_index }}</deviceIndex>
<status>attached</status> <status>attached</status>
<attachTime>2015-01-01T00:00:00+0000</attachTime> <attachTime>2015-01-01T00:00:00Z</attachTime>
<deleteOnTermination>true</deleteOnTermination> <deleteOnTermination>true</deleteOnTermination>
</attachment> </attachment>
{% if nic.public_ip %} {% if nic.public_ip %}
@ -462,7 +462,7 @@ EC2_DESCRIBE_INSTANCES = """<DescribeInstancesResponse xmlns="http://ec2.amazona
<attachmentId>{{ nic.attachment_id }}</attachmentId> <attachmentId>{{ nic.attachment_id }}</attachmentId>
<deviceIndex>{{ nic.device_index }}</deviceIndex> <deviceIndex>{{ nic.device_index }}</deviceIndex>
<status>attached</status> <status>attached</status>
<attachTime>2015-01-01T00:00:00+0000</attachTime> <attachTime>2015-01-01T00:00:00Z</attachTime>
<deleteOnTermination>true</deleteOnTermination> <deleteOnTermination>true</deleteOnTermination>
</attachment> </attachment>
{% if nic.public_ip %} {% if nic.public_ip %}