ec2launcher 1.6.12 → 1.6.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzNhM2JmODY2YjgzN2U3ZDBkODc5NDllNTdlMWI3ZDA1ZDdlMTk1Nw==
+    ODJmZTIzNmIzZDM3NGNhOGIxYzlhZmRiNzdjMDQ4YjQ4NmI0ZGUxZA==
   data.tar.gz: !binary |-
-    ZWIxMWMxNzE0ZTMyYTIzZTlhMGJiNTQ0MjU5NmU5ZGRiNmVlMmQxYg==
+    ZTY3MGRlYmIwMzIzMmI0M2VkMDI1MjkzNDc0MTA4MjgwNjc0MDNjMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTIwYThjNmVlYWVhMTI0NTJhNTU2ODI5ZWNlODQ1ZWUxZmYwMmE1MWIwNmYz
-    OTYxZmE5NzRlNDQxMjMwY2E4ZTA5ODc5ZjY1Njc4MjA5Njk4ZjhmMTMwOTQz
-    Yjc4YWM5MTgyZTM1NjlmMmFkYzU1MzJjYmZmOWNkZjhlZDQxYzk=
+    MzI5ZGFkMzQyYzM5OTk3MTI1YWQyNzkxYTUwZDUxNWNhNmYzYmI4YjkwNGQ3
+    YjcyMDdmNDViMjM3YTc1M2EyZjE1NzM5ODhhOGNkZmJiZDhiYmM3YTA4Zjg1
+    ZGYwMzZlMWYzYzIwYTRkYTc5N2M2YmMzNjhmMWIwZDIwNGEwMmI=
   data.tar.gz: !binary |-
-    Njk0OGMwZGZhYjAzOWI5MmJjMzNhMGQxMjQyNDUxN2YyNGY5ZDBmNDcwYWJh
-    NzljZDk1YzZmYmVlZWJhYTQwNTUxMmU5Nzg3MmFiN2ZiNWFmZDdlMDA4MGUx
-    YTlhNTRmZmVlNzBmMTNhYjBlMTZlNmNmNDkwNjE4ODAwZmQ2Mzk=
+    ZWI1Y2I5NWVhNjJhMzg0Zjc2ZGNlZjUzNmU5YmUxOGNmOTg4NjY5MjE0NDll
+    ZTJjNWIyZWVmYzJjZGUyZTRlMTU3ZjY5Y2UwYzVjOGMxZDY2M2Q1ZDY0MDk5
+    ZWFiZTQ5Y2U3NTNjNjRhOWZjMTg2MzhlYTNhYzk1YzAzZDY2ODY=

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.6.14
+
+* Undo block device changes.
+
+## 1.6.13
+
+* Even more fixes for handling block devices on startup.
+
 ## 1.6.12
 
 * More fixes for handling block devices on startup.

data/lib/ec2launcher/version.rb

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

data/startup-scripts/setup_instance.rb

@@ -288,14 +288,19 @@ EOF
   end
 
   def setup_ebs_volumes(instance_data)
+    puts "Setting up EBS volumes..."
+
     # Install mdadm if we have any RAID devices
     raid_required = false
     instance_data["block_devices"].each do |block_device|
-      unless block_device["raid_level"].nil?
+      unless block_device.raid_level.nil?
         raid_required = true
         break
       end
     end
+
+    puts "RAID required: #{raid_required.to_s}"
+
     if raid_required
       result = run_command("yum install mdadm -y")
       unless result == 0
@@ -369,34 +374,34 @@ EOF
     raid_array_count = 0
     next_device_name = "xvdj"
     instance_data["block_devices"].each do |block_device|
-      if block_device["raid_level"].nil?
+      if block_device.raid_level.nil?
         # If we're not cloning an existing snapshot, then we need to partition and format the drive.
         if @options.clone_host.nil?
           partition_devices([ "/dev/#{next_device_name}" ])
           format_filesystem(@system_arch, "/dev/#{next_device_name}1")
         end
         
-        if block_device["block_ra"]
-          set_block_read_ahead("/dev/#{next_device_name}1", block_device["block_ra"])
+        if block_device.block_ra
+          set_block_read_ahead("/dev/#{next_device_name}1", block_device.block_ra)
         end
 
-        mount_device("/dev/#{next_device_name}1", block_device["mount"], block_device["owner"], block_device["group"], @default_fs_type)
+        mount_device("/dev/#{next_device_name}1", block_device.mount, block_device.owner, block_device.group, @default_fs_type)
         next_device_name.next!
       else
         raid_devices = []
-        build_block_devices(block_device["count"], next_device_name) do |device_name, index|
+        build_block_devices(block_device.count, next_device_name) do |device_name, index|
           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["raid_level"].to_i, ! @options.clone_host.nil?)
+        raid_device_name = setup_attached_raid_array(@system_arch, raid_devices, "/dev/md#{(127 - raid_array_count).to_s}", block_device.raid_level.to_i, ! @options.clone_host.nil?)
         
-        if block_device.respond_to?(:block_ra) && block_device["block_ra"]
-          raid_devices.each {|device_name| set_block_read_ahead("#{device_name}1", block_device["block_ra"]) }
-          set_block_read_ahead(raid_device_name, block_device["block_ra"])
+        if block_device.block_ra
+          raid_devices.each {|device_name| set_block_read_ahead("#{device_name}1", block_device.block_ra) }
+          set_block_read_ahead(raid_device_name, block_device.block_ra)
         end
 
-        mount_device(raid_device_name, block_device["mount"], block_device["owner"], block_device["group"], @default_fs_type)
+        mount_device(raid_device_name, block_device.mount, block_device.owner, block_device.group, @default_fs_type)
         raid_array_count += 1
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.6.12
+  version: 1.6.14
 platform: ruby
 authors:
 - Sean Laurent
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk