vominator 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0c0d2ced046104f160fbe3dcfe0eb1d62bda5de
-  data.tar.gz: 5c5d4b48d8c3f3e608b81e67b97754e95307a926
+  metadata.gz: ab4d26c8042a6b51eb9e476621edc81212507666
+  data.tar.gz: e2a4c5a3c06f1f9877e8a1b7cf6623bd94b1447c
 SHA512:
-  metadata.gz: ab07df9cde02ebf6fa2708dfa06d285ae8e47f5d18333c9b74f1f7e550c8d49f25200574af4fa9daed8ea41e92265e737cd75eb98630523cfbbe546a2988a4c1
-  data.tar.gz: e435d4d9781779295c8aea362c675c473463d84ed6d5fab1e192e1b58a261540159e34e541354db2682ddeae7b1e604a6ec978e92b04dd7eb84c850b2f6db5ff
+  metadata.gz: 1bfdd612da78808cb2fdd38f1da80a412fa33a152fd37c7e54d2b0004f9bd0157cdcc40b266f1daa1c7600b6d01be68d80d2c1f002792664537b0b74f0881e44
+  data.tar.gz: f81208b80df183c517527411c8742b558deff16e3ae88ae8aab40f059337c82ca3fc7276796fafea6238ae2ac2008282b4ca59edcde09c581e38713ffa2d258a

data/lib/ec2/instances.rb

@@ -343,7 +343,7 @@ instances.each do |instance|
     end
 
   else #The instance does not exist, in which case we want to create it.
-    user_data = Vominator::Instances.generate_cloud_config(hostname, options[:environment], instance['family'], instance['chef_roles'], instance['chef_recipes'])
+    user_data = Vominator::Instances.generate_cloud_config(hostname, options[:environment], options[:environment].gsub('.','-'), instance['family'], instance['chef_roles'], instance['chef_recipes'])
     security_group_ids = instance_security_groups.map {|sg| vpc_security_groups[sg] }.compact
     unless test?("Would create #{fqdn}")
       ec2_instance = Vominator::EC2.create_instance(ec2, hostname, options[:environment], ami, existing_subnets[subnet].id, instance_type, key_name, instance_ip, instance_az, security_group_ids, user_data, ebs_optimized, instance['iam_profile'])

data/lib/vominator/instances.rb

@@ -20,7 +20,7 @@ module Vominator
       end
     end
 
-    def self.generate_cloud_config(hostname, environment, family, roles, recipes)
+    def self.generate_cloud_config(hostname, environment, chef_environment, family, roles, recipes)
       template = "#{family}_cloud_config_template"
       begin
         cloud_config_template = File.read("#{VOMINATOR_CONFIG['configuration_path']}/cloud-configs/#{PUKE_CONFIG[environment][template]}")
@@ -28,7 +28,7 @@ module Vominator
         LOGGER.fatal("Unable to find #{template} in your cloud-config directory. Check that this file exists in #{VOMINATOR_CONFIG['configuration_path']}/cloud-configs/")
       end
       cloud_config = Erubis::Eruby.new(cloud_config_template)
-      return cloud_config.result(:hostname => hostname, :env => environment, :roles => roles, :recipes => recipes)
+      return cloud_config.result(:hostname => hostname, :env => environment, :chef_env => chef_environment, :roles => roles, :recipes => recipes)
     end
   end
 end

data/lib/vominator/version.rb

@@ -1,3 +1,3 @@
 module Vominator
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vominator
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Chris Kelly
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk