ec2launcher 1.0.28 → 1.0.30

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.30
+
+* Fixed bug with EBS volume mount locations.
+
 ## 1.0.28
 
 * Fixed problem with pre/post command inheritance.

data/lib/ec2launcher.rb

@@ -48,6 +48,8 @@ module EC2Launcher
     def launch(options)
       @options = options
 
+      @log.info "ec2launcher v#{EC2Launcher::VERSION}"
+
       @log.level = case @options.verbosity 
         when :quiet then WARN
         when :verbose then DEBUG
@@ -526,7 +528,7 @@ module EC2Launcher
     # @return [String] DNS for the instance or "n/a" if undefined.
     #
     def get_instance_dns(ec2_instance, public = true)
-      dns_name = public ? instance.public_dns_name : instance.private_dns_name
+      dns_name = public ? ec2_instance.public_dns_name : ec2_instance.private_dns_name
       dns_name.nil? ? "n/a" : dns_name
     end
 
@@ -827,11 +829,7 @@ module EC2Launcher
       user_data += "\necho '#{setup_json.to_json}' > /tmp/setup.json"
 
       # pre-commands, if necessary
-      puts "Precommands: #{@environment.precommands}"
-      unless @environment.precommand.nil? || @environment.precommand.empty?
-        commands = @environment.precommand.collect {|cmd| substitute_command_variables(cmd) }
-        user_data += "\n" + commands.join("\n")
-      end
+      user_data += build_commands(@environment.precommand)
 
       user_data += "\n"
 
@@ -870,17 +868,26 @@ module EC2Launcher
       end
 
       # Add extra requested commands to the launch sequence
-      unless @options.commands.nil?
-        commands = @options.commands.collect {|cmd| substitute_command_variables(cmd) }
-        user_data += "\n" + commands.join("\n")
-      end
+      user_data += build_commands(@options.commands)
 
       # Post commands
-      unless @environment.postcommand.nil? || @environment.postcommand.empty?
-        commands = @environment.postcommand.collect {|cmd| substitute_command_variables(cmd) }
-        user_data += "\n" + commands.join("\n")
-      end
+      user_data += build_commands(@environment.postcommand)
+
       user_data
     end
+
+    # Builds a bash script snipp containing a list of commands to execute.
+    #
+    # @param [Array<String>] commands List of commands to run. Can be nil.
+    #
+    # @return [String] String containing newline separated bash commands to run or an empty string if no commands.
+    def build_commands(commands)
+      command_str = ""
+      unless commands.nil? || commands.empty?
+        processed_commands = commands.collect {|cmd| substitute_command_variables(cmd) }
+        command_str = "\n" + processed_commands.join("\n")
+      end
+      command_str
+    end
   end
 end

data/lib/ec2launcher/dsl/block_device.rb

@@ -32,7 +32,7 @@ module EC2Launcher
 					"name" => @name,
 					"count" => @count,
 					"raid_level" => @raid_level,
-					"mount_point" => @mount_point,
+					"mount_point" => @mount,
 					"owner" => @owner,
 					"group" => @group
 				}.to_json(*a)

data/lib/ec2launcher/version.rb

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

data/startup-scripts/setup_instance.rb

@@ -226,11 +226,15 @@ def setup_attached_raid_array(system_arch, devices, raid_device = '/dev/md0', ra
     array_uuid = `mdadm --detail #{raid_device}|grep UUID|awk '// { print $3; }'`.strip
 
     # We have to manually update mdadm.conf as well
-    `echo ARRAY #{raid_device} level=raid#{raid_type.to_s} num-devices=#{devices.count.to_s} meta-data=0.90 UUID=#{array_uuid} |tee -a /etc/mdadm.conf`
+    #`echo ARRAY #{raid_device} level=raid#{raid_type.to_s} num-devices=#{devices.count.to_s} meta-data=0.90 UUID=#{array_uuid} |tee -a /etc/mdadm.conf`
+    `echo ARRAY #{raid_device} level=raid#{raid_type.to_s} num-devices=#{devices.count.to_s} UUID=#{array_uuid} |tee -a /etc/mdadm.conf`
   else
     raid_info = raid_scan_info.split("\n")[-1].split()[1]
   end
-	Pathname.new(raid_info).realpath.to_s
+  raid_device_real_path = Pathname.new(raid_info).realpath.to_s
+  puts "Using raid device: #{raid_info}. Real path: #{raid_device_real_path}"
+	
+  raid_device_real_path
 end
 
 def build_block_devices(count, device = "xvdj", &block)
@@ -308,6 +312,7 @@ unless instance_data["block_devices"].nil?
 				raid_devices << "/dev/#{device_name}"
 				next_device_name = device_name
 			end
+      puts "Setting up attached raid array... system_arch = #{system_arch}, raid_devices = #{raid_devices}, device = /dev/md#{(127 - raid_array_count).to_s}"
 			raid_device_name = setup_attached_raid_array(system_arch, raid_devices, "/dev/md#{(127 - raid_array_count).to_s}", block_device_json["raid_level"].to_i, ! options.clone_host.nil?)
 			mount_device(raid_device_name, block_device_json["mount_point"], block_device_json["owner"], block_device_json["group"], default_fs_type)
       raid_array_count += 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.0.28
+  version: 1.0.30
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk