ec2launcher 1.5.0 → 1.5.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.5.1
+
+* Change order for processing environment aliases.
+
 ## 1.5.0
 
 * Initial support for Provisioned IOPS for EBS volumes.

data/lib/ec2launcher/environment_processor.rb

@@ -28,7 +28,6 @@ module EC2Launcher
           validate_environment(filename, new_env)
 
           @environments[new_env.name] = new_env
-          new_env.aliases.each {|env_alias| @environments[env_alias] = new_env }
         end
       end
 
@@ -37,6 +36,11 @@ module EC2Launcher
         new_env = process_environment_inheritance(env)
         @environments[new_env.name] = new_env
       end
+
+      # Process aliases
+      @environments.values.each do |env|
+        env.aliases.each {|env_alias| @environments[env_alias] = env }
+      end
     end
 
     private

data/lib/ec2launcher/version.rb

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

data/startup-scripts/setup_instance.rb

@@ -113,17 +113,18 @@ class InstanceSetup
     ##############################
     # EBS VOLUMES
     ##############################
-    # Create and setup EBS volumes = 
+    @system_arch = `uname -p`.strip
+    @default_fs_type = @system_arch == "x86_64" ? "xfs" : "ext4"
+
+    # Create and setup EBS volumes
     setup_ebs_volumes(instance_data) unless instance_data["block_devices"].nil?
   
     ##############################
     # EPHEMERAL VOLUMES
     ##############################
-    system_arch = `uname -p`.strip
-    default_fs_type = system_arch == "x86_64" ? "xfs" : "ext4"
 
     #  Process ephemeral devices first
-    ephemeral_drive_count = case EC2_INSTANCE_TYPE
+    ephemeral_drive_count = case @EC2_INSTANCE_TYPE
       when "m1.small" then 1
       when "m1.medium" then 1
       when "m2.xlarge" then 1
@@ -148,13 +149,13 @@ class InstanceSetup
 
     # Format and mount the ephemeral drives
     build_block_devices(ephemeral_drive_count, "xvdf") do |device_name, index|
-      format_filesystem(system_arch, "/dev/#{device_name}1")
+      format_filesystem(@system_arch, "/dev/#{device_name}1")
 
       mount_point = case index
         when 0 then "/mnt"
         else "/mnt/extra#{index - 1}"
       end
-      mount_device("/dev/#{device_name}1", mount_point, "root", "root", default_fs_type)
+      mount_device("/dev/#{device_name}1", mount_point, "root", "root", @default_fs_type)
     end
 
     ##############################
@@ -170,7 +171,7 @@ class InstanceSetup
     knife_config = <<EOF
 log_level                :info
 log_location             STDOUT
-node_name                '#{options.hostname}'
+node_name                '#{@options.hostname}'
 client_key               '/etc/chef/client.pem'
 validation_client_name   'chef-validator'
 validation_key           '/etc/chef/validation.pem'
@@ -186,7 +187,7 @@ EOF
     ##############################
     # Add roles
     instance_data["roles"].each do |role|
-      cmd = "#{knife_path} node run_list add #{options.hostname} \"role[#{role}]\""
+      cmd = "#{knife_path} node run_list add #{@options.hostname} \"role[#{role}]\""
       puts cmd
       puts `#{cmd}`
     end
@@ -217,9 +218,9 @@ EOF
       ses.send_email(
         :from => instance_data["email_notifications"]["from"],
         :to => instance_data["email_notifications"]["to"],
-        :subject => "Server setup complete: #{options.hostname}",
-        :body_text => "Server setup is complete for Host: #{options.hostname}, Environment: #{options.environ}, Application: #{options.application}",
-        :body_html => "<div>Server setup is complete for:</div><div><strong>Host:</strong> #{options.hostname}</div><div><strong>Environment:</strong> #{options.environ}</div><div><strong>Application:</strong> #{options.application}</div>"
+        :subject => "Server setup complete: #{@options.hostname}",
+        :body_text => "Server setup is complete for Host: #{@options.hostname}, Environment: #{@options.environ}, Application: #{@options.application}",
+        :body_html => "<div>Server setup is complete for:</div><div><strong>Host:</strong> #{@options.hostname}</div><div><strong>Environment:</strong> #{@options.environ}</div><div><strong>Application:</strong> #{@options.application}</div>"
       )
     else
       puts "Skipping email notification."
@@ -270,8 +271,15 @@ EOF
     run_with_backoff(60, 1, "attaching volume #{volume.id} to #{device_name}") do
       attachment = volume.attach_to(instance, device_name)
     end
+
     volume_attached = test_with_backoff(60, 1, "check EBS volume attached #{device_name} (#{volume.id})") do
-      attachment.status == :attached
+      attatched = false
+      begin
+        attached = attachment.status == :attached
+      rescue AWS::Core::Resource::NotFound
+        # This can occur when trying to access the attachment. Not sure how or why. Best to retry.
+      end
+      attached
     end
 
     # TODO: Handle when volume fails to attach
@@ -360,24 +368,24 @@ EOF
 
     raid_array_count = 0
     next_device_name = "xvdj"
-    instance_data["block_devices"].each do |block_device_json|
-      if block_device_json["raid_level"].nil?
+    instance_data["block_devices"].each do |block_device|
+      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?
+        if @options.clone_host.nil?
           partition_devices([ "/dev/#{next_device_name}" ])
-          format_filesystem(system_arch, "/dev/#{next_device_name}1")
+          format_filesystem(@system_arch, "/dev/#{next_device_name}1")
         end
-        mount_device("/dev/#{next_device_name}1", block_device_json["mount_point"], block_device_json["owner"], block_device_json["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_json["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_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)
+        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?)
+        mount_device(raid_device_name, block_device.mount, block_device.owner, block_device.group, @default_fs_type)
         raid_array_count += 1
       end
     end
@@ -423,8 +431,14 @@ EOF
   end
 
   # Partitions a list of mounted EBS volumes
-  def partition_devices(device_list)
-    puts "Partioning devices ..."
+  def partition_devices(device_list, attempt = 0, max_attempts = 3)
+    return false if attempt >= max_attempts
+
+    puts case attempt
+      when 0 then  "Partioning devices ..." 
+      else "Retrying device partitioning (attempt #{attempt + 1}) ..." 
+    end
+
     device_list.each do |device|
       puts "  * #{device}"
       `echo 0|sfdisk #{device}`
@@ -432,6 +446,19 @@ EOF
 
     puts "Sleeping 10 seconds to reload partition tables ..."
     sleep 10
+
+    # Verify all volumes were properly partitioned
+    missing_devices = []
+    device_list.each do |device|
+      missing_devices << device unless File.exists?("#{device}1")
+    end
+
+    # Retry partitioning for failed volumes
+    response = true
+    if missing_devices.size > 0
+      response = partition_devices(missing_devices, attempt + 1, max_attempts)
+    end
+    response
   end
 
   ##############################

metadata

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