ec2launcher 1.0.20 → 1.0.21

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.21
+
+* Fixed bugs with merging applications together under certain circumstances.
+
 ## 1.0.20
 
 * New command line option to show user-data.

data/lib/ec2launcher/dsl/application.rb

@@ -204,11 +204,25 @@ module EC2Launcher
 				@ami_name = other_server.ami_name unless other_server.ami_name.nil?
 				@availability_zone = other_server.availability_zone unless other_server.availability_zone.nil?
 				@basename = other_server.basename unless other_server.basename.nil?
-				other_server.block_devices.each {|bd| @block_devices << bd } unless other_server.block_devices.nil?
-				other_server.elb.keys.each {|env_name| @elb[env_name] = other_server.elb[env_name] } unless other_server.elb.nil?
+				
+				unless other_server.block_devices.nil?
+					@block_devices = []
+					other_server.block_devices.each {|bd| @block_devices << bd }
+				end
+				
+				unless other_server.elb.nil?
+					@elb = {}
+					other_server.elb.keys.each {|env_name| @elb[env_name] = other_server.elb[env_name] } 
+				end
+				
 				@instance_type = other_server.instance_type unless other_server.instance_type.nil?
 				@name_suffix = other_server.name_suffix unless other_server.name_suffix.nil?
-				other_server.roles.each {|role| @roles << role } unless other_server.roles.nil?
+				
+				unless other_server.roles.nil?
+					@roles = []
+					other_server.roles.each {|role| @roles << role } 
+				end
+
 				unless other_server.security_groups.nil?
 					other_server.security_groups.keys.each do |env_name|
 						unless @security_groups.has_key? env_name

data/lib/ec2launcher/version.rb

@@ -2,5 +2,5 @@
 # Copyright (c) 2012 Sean Laurent
 #
 module EC2Launcher
-  VERSION = "1.0.20"
+  VERSION = "1.0.21"
 end

data/startup-scripts/setup_instance.rb

@@ -272,7 +272,7 @@ build_block_devices(ephemeral_drive_count, "xvdf") do |device_name, index|
 	format_filesystem(system_arch, "/dev/#{device_name}1")
 
 	mount_point = case index
-		when 1 then "/mnt"
+		when 0 then "/mnt"
 		else "/mnt/extra#{index - 1}"
 	end
 	mount_device("/dev/#{device_name}1", mount_point, "root", "root", default_fs_type)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.0.21
   prerelease: 
 platform: ruby
 authors: