formatron 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 932f38c884b67c73450aa6842772390de1db150f
-  data.tar.gz: 7e70e25c5de6024938501fc0935c33c392546bc0
+  metadata.gz: 5dc23305a2c92b7c561a92448718f825838a290a
+  data.tar.gz: a0177f3af41161bdeaaf39ed426e75cbac5837f1
 SHA512:
-  metadata.gz: 9c1d72b86843a572767eadc0607cc3a8b8275d392b3ad73902186313c04809446dde1ba7bd13c2ea74b2f8b3a371014a2b95c1956a5e98da8b5fb099a7dca76e
-  data.tar.gz: 69abb715018d08008170e6192499695561dc8532c00dd5f2aed3283e989538aed49bd3d43d5fbaaa6f71087c20292fd6080d25f7b9185451d242424a3fb1c29d
+  metadata.gz: d07528b6d5d0d765d63c2950bd2778a8fa7d7432612322f83540429fa7a862ff0c77bf94cd21f92eabda1900abcd682e672d5749d586391e557f5f1a5798ca68
+  data.tar.gz: 2d8a8f5fd738049ea766db611ecb84a627e9af7bf9a92e8d06e76492a488b4f0174f8bc70677f830bda130bf35aadc803533aad2e2c642b269ecee94bd5a2db8

data/lib/formatron/cloud_formation/resources/ec2.rb

@@ -287,8 +287,14 @@ class Formatron
           security_group:,
           logical_id:,
           source_dest_check:,
-          os:
+          os:,
+          ami:
         )
+          ami = Template.find_in_map(
+            Template::REGION_MAP,
+            Template.ref('AWS::Region'),
+            os
+          ) if ami.nil?
           if os.eql? 'windows'
             user_data = Template.base_64(
               Template.join(
@@ -347,11 +353,7 @@ class Formatron
                 Template.ref('AWS::Region'),
                 availability_zone
               ),
-              ImageId: Template.find_in_map(
-                Template::REGION_MAP,
-                Template.ref('AWS::Region'),
-                os
-              ),
+              ImageId: ami,
               SourceDestCheck: source_dest_check,
               InstanceType: instance_type,
               KeyName: key_name,

data/lib/formatron/cloud_formation/template/vpc/subnet/instance.rb

@@ -65,6 +65,7 @@ class Formatron
               @availability_zone = availability_zone
               @instance_type = @instance.instance_type || 't2.micro'
               @os = @instance.os || 'ubuntu'
+              @ami = @instance.ami
               @key_pair = key_pair
               @administrator_name = administrator_name
               @administrator_password = administrator_password
@@ -135,7 +136,8 @@ class Formatron
                 security_group: @security_group_id,
                 logical_id: @instance_id,
                 source_dest_check: @source_dest_check,
-                os: @os
+                os: @os,
+                ami: @ami
               )
               setup = Setup.new(
                 setup: @setup,

data/lib/formatron/dsl/formatron/vpc/subnet/instance.rb

@@ -22,6 +22,7 @@ class Formatron
             dsl_property :source_dest_check
             dsl_property :instance_type
             dsl_property :os
+            dsl_property :ami
             dsl_block :chef, 'Chef'
             dsl_block :policy, 'Policy'
             dsl_block :security_group, 'SecurityGroup'

data/lib/formatron/version.rb

@@ -1,4 +1,4 @@
 # add version to class
 class Formatron
-  VERSION = '0.1.15'
+  VERSION = '0.1.16'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formatron
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Peter Halliday