formatron 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53582a32e61c5a984b2ce3a963398f7b6ac4ffd8
-  data.tar.gz: 42a7c9b8047d9b58ad96ed6754e3c4441140b9ce
+  metadata.gz: e23febc96d23ac6ff4f4470c71576e041df88940
+  data.tar.gz: 18f87f4c18052dcf49e427ed868c829d1e716d73
 SHA512:
-  metadata.gz: bdec0b8c3ac59c8e2c717fd0da9f8a4d661c4a2fdeec56150d9f75c35d3d856daa211e4730af30ab83554803888f56454656386f17e2623930e584e8f86847ce
-  data.tar.gz: c077d7d087c9a13d2c01ca5fb77fe90a9efb4505e97424a5d6b167c77b4fc8f6577c0f71cf31210da16c8b6b7c4b5bfbf18dac8131232af484f23543942d4f38
+  metadata.gz: 88c4d3022729f3462ae8152ab1436f2b9e718b427b7f37f7df03b314ad77510505e97b9a077533e5db3e83b280034c36ab65a21787f7c2a5516ffab8adf62a0d
+  data.tar.gz: 7a7068ff48ab616219e4e9111348b79829eee540dca0fcd1c5d8224b45e9a4c275ebe81fd79ace810548a45b7b64a23264bb2bbf8e2ca347be3048933326bcf1

data/lib/formatron/generators/bootstrap/formatronfile/Formatronfile.erb

@@ -14,11 +14,11 @@ formatron.global do |global|
 end
 
 formatron.vpc 'vpc' do |vpc|
-  vpc.guid 'VPC<%= guid %>'
+  vpc.guid 'vpc<%= guid %>'
   vpc.cidr '10.0.0.0/16'
 
   vpc.subnet 'management' do |subnet|
-    subnet.guid 'SUBNET<%= guid %>'
+    subnet.guid 'subnet<%= guid %>'
     subnet.availability_zone '<%= params[:availability_zone] %>'
     subnet.cidr '10.0.0.0/24'
     subnet.acl do |acl|
@@ -26,7 +26,7 @@ formatron.vpc 'vpc' do |vpc|
     end
 
     subnet.bastion 'bastion' do |bastion|
-      bastion.guid 'BASTION<%= guid %>'
+      bastion.guid 'bastion<%= guid %>'
       bastion.sub_domain config['bastion']['sub_domain']
       bastion.chef do |chef|
         chef.cookbook 'cookbooks/bastion_instance'
@@ -34,7 +34,7 @@ formatron.vpc 'vpc' do |vpc|
     end
 
     subnet.nat 'nat' do |nat|
-      nat.guid 'NAT<%= guid %>'
+      nat.guid 'nat<%= guid %>'
       nat.sub_domain config['nat']['sub_domain']
       nat.chef do |chef|
         chef.cookbook 'cookbooks/nat_instance'
@@ -42,7 +42,7 @@ formatron.vpc 'vpc' do |vpc|
     end
 
     subnet.chef_server 'chef_server' do |chef_server|
-      chef_server.guid 'CHEF<%= guid %>'
+      chef_server.guid 'chef<%= guid %>'
       chef_server.version '12.2.0-1'
       chef_server.sub_domain config['chef_server']['sub_domain']
       chef_server.cookbooks_bucket config['chef_server']['cookbooks_bucket']
@@ -65,13 +65,13 @@ formatron.vpc 'vpc' do |vpc|
   end
 
   vpc.subnet 'public' do |subnet|
-    subnet.guid 'SUBNET<%= guid %>'
+    subnet.guid 'subnet<%= guid %>'
     subnet.availability_zone '<%= params[:availability_zone] %>'
     subnet.cidr '10.0.1.0/24'
   end
 
   vpc.subnet 'private' do |subnet|
-    subnet.guid 'SUBNET<%= guid %>'
+    subnet.guid 'subnet<%= guid %>'
     subnet.availability_zone '<%= params[:availability_zone] %>'
     subnet.cidr '10.0.2.0/24'
     subnet.gateway 'nat'

data/lib/formatron/generators/instance/formatronfile/Formatronfile.erb

@@ -6,7 +6,7 @@ formatron.depends '<%= params[:bootstrap_configuration] %>'
 formatron.vpc '<%= params[:vpc] %>' do |vpc|
   vpc.subnet '<%= params[:subnet] %>' do |subnet|
     subnet.instance '<%= params[:instance_name] %>' do |instance|
-      instance.guid 'INSTANCE<%= guid %>'
+      instance.guid 'instance<%= guid %>'
       instance.sub_domain config['<%= params[:instance_name] %>']['sub_domain']
       instance.chef do |chef|
         chef.cookbook 'cookbooks/<%= params[:instance_name] %>_instance'

data/lib/formatron/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formatron
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Peter Halliday
@@ -413,7 +413,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: AWS/Chef Deployment Tool