formatron 0.1.15 → 0.1.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5dc23305a2c92b7c561a92448718f825838a290a
|
|
4
|
+
data.tar.gz: a0177f3af41161bdeaaf39ed426e75cbac5837f1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d07528b6d5d0d765d63c2950bd2778a8fa7d7432612322f83540429fa7a862ff0c77bf94cd21f92eabda1900abcd682e672d5749d586391e557f5f1a5798ca68
|
|
7
|
+
data.tar.gz: 2d8a8f5fd738049ea766db611ecb84a627e9af7bf9a92e8d06e76492a488b4f0174f8bc70677f830bda130bf35aadc803533aad2e2c642b269ecee94bd5a2db8
|
|
@@ -287,8 +287,14 @@ class Formatron
|
|
|
287
287
|
security_group:,
|
|
288
288
|
logical_id:,
|
|
289
289
|
source_dest_check:,
|
|
290
|
-
os
|
|
290
|
+
os:,
|
|
291
|
+
ami:
|
|
291
292
|
)
|
|
293
|
+
ami = Template.find_in_map(
|
|
294
|
+
Template::REGION_MAP,
|
|
295
|
+
Template.ref('AWS::Region'),
|
|
296
|
+
os
|
|
297
|
+
) if ami.nil?
|
|
292
298
|
if os.eql? 'windows'
|
|
293
299
|
user_data = Template.base_64(
|
|
294
300
|
Template.join(
|
|
@@ -347,11 +353,7 @@ class Formatron
|
|
|
347
353
|
Template.ref('AWS::Region'),
|
|
348
354
|
availability_zone
|
|
349
355
|
),
|
|
350
|
-
ImageId:
|
|
351
|
-
Template::REGION_MAP,
|
|
352
|
-
Template.ref('AWS::Region'),
|
|
353
|
-
os
|
|
354
|
-
),
|
|
356
|
+
ImageId: ami,
|
|
355
357
|
SourceDestCheck: source_dest_check,
|
|
356
358
|
InstanceType: instance_type,
|
|
357
359
|
KeyName: key_name,
|
|
@@ -65,6 +65,7 @@ class Formatron
|
|
|
65
65
|
@availability_zone = availability_zone
|
|
66
66
|
@instance_type = @instance.instance_type || 't2.micro'
|
|
67
67
|
@os = @instance.os || 'ubuntu'
|
|
68
|
+
@ami = @instance.ami
|
|
68
69
|
@key_pair = key_pair
|
|
69
70
|
@administrator_name = administrator_name
|
|
70
71
|
@administrator_password = administrator_password
|
|
@@ -135,7 +136,8 @@ class Formatron
|
|
|
135
136
|
security_group: @security_group_id,
|
|
136
137
|
logical_id: @instance_id,
|
|
137
138
|
source_dest_check: @source_dest_check,
|
|
138
|
-
os: @os
|
|
139
|
+
os: @os,
|
|
140
|
+
ami: @ami
|
|
139
141
|
)
|
|
140
142
|
setup = Setup.new(
|
|
141
143
|
setup: @setup,
|
data/lib/formatron/version.rb
CHANGED