ec2launcher 1.6.10 → 1.6.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWZjMTNlZDBmNmQ4ZTEzMzJhYjBkNzdhM2Q5ZGJmYmQ1ZGE0Y2QxMw==
+    MzNhM2JmODY2YjgzN2U3ZDBkODc5NDllNTdlMWI3ZDA1ZDdlMTk1Nw==
   data.tar.gz: !binary |-
-    YzA3MmZiNjE2YjIxOTE4NjdkNTI5Y2M1MmI4ZjdkZTEwZTFhNWJmMg==
+    ZWIxMWMxNzE0ZTMyYTIzZTlhMGJiNTQ0MjU5NmU5ZGRiNmVlMmQxYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWVmNDA5MjRiNTU1YmE4MTNhNDNiMGZhOTQ1MTM2YmRhOThlYmJhMjY0YmNm
-    MmNhZWVmOTEwYjA0MTE3ZGY4NTNmYzkyMzlmMTM4YzAzMTk1Y2JlYjQ2NjQ1
-    OGYzMWNmMzAxMzAxZDRiMjM2NjA5MjYzZjUzNDYzMjljYjE3YTE=
+    NTIwYThjNmVlYWVhMTI0NTJhNTU2ODI5ZWNlODQ1ZWUxZmYwMmE1MWIwNmYz
+    OTYxZmE5NzRlNDQxMjMwY2E4ZTA5ODc5ZjY1Njc4MjA5Njk4ZjhmMTMwOTQz
+    Yjc4YWM5MTgyZTM1NjlmMmFkYzU1MzJjYmZmOWNkZjhlZDQxYzk=
   data.tar.gz: !binary |-
-    MzQyZTRhNmZjNWI5ZjA0MmY2OTA5YTZlNmVjYjM5YjgyYWE3YjJiZmM4MDFm
-    NjgxYjQ3NGYzYWM3MmMwZjY3ZDBlOTkxMTcxYWVhMDZhM2IxZTE0ZGE3NTY4
-    NDY2M2ZjNWQ2ODYwZTc2OTk5ZjZhZjRjYTg4NjhmOWJlMDJkNDQ=
+    Njk0OGMwZGZhYjAzOWI5MmJjMzNhMGQxMjQyNDUxN2YyNGY5ZDBmNDcwYWJh
+    NzljZDk1YzZmYmVlZWJhYTQwNTUxMmU5Nzg3MmFiN2ZiNWFmZDdlMDA4MGUx
+    YTlhNTRmZmVlNzBmMTNhYjBlMTZlNmNmNDkwNjE4ODAwZmQ2Mzk=

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.6.12
+
+* More fixes for handling block devices on startup.
+
+## 1.6.11
+
+* Fixed two additional small typos with handling block devices in raid arrays on startup.
+
 ## 1.6.10
 
 * Fixed small typo with handling block devices in raid arrays on startup.

data/lib/ec2launcher/version.rb

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

data/startup-scripts/setup_instance.rb

@@ -369,34 +369,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.respond_to?(:block_ra) && 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.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"])
         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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.6.10
+  version: 1.6.12
 platform: ruby
 authors:
 - Sean Laurent