ec2launcher 1.0.17 → 1.0.18

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.18
+
+* Additional command subsitution variables for ruby, gem, chef-client and knife executables.
+
 ## 1.0.17
 
 * Added support to substitute the application name and environment name in pre/post commands.

data/lib/ec2launcher/instance_paths_config.rb

@@ -0,0 +1,31 @@
+#
+# Copyright (c) 2012 Sean Laurent
+#
+module EC2Launcher
+  # Holds data about paths to various executables on instances.
+  class InstancePathsConfig
+    attr_reader :gem_path, :ruby_path, :chef_path, :knife_path
+
+    def initialize(environment)
+      @gem_path = build_path(environment.gem_path, "gem", "/usr/bin/gem")
+      @ruby_path = build_path(environment.ruby_path, "ruby", "/usr/bin/ruby")
+      @chef_path = build_path(environment.chef_path, "chef-client", "/usr/bin/chef-client")
+      @knife_path = build_path(environment.knife_path, "knife", "/usr/bin/knife")
+    end
+
+    private
+
+    # Builds the path to an executable.
+    def build_path(instance_path, executable, default_path)
+      app_path = default_path
+      unless instance_path.nil?
+        if instance_path =~ /#{executable}$/
+          app_path = instance_path
+        else
+          app_path = File.join(instance_path, executable)
+        end
+      end
+      app_path
+    end
+  end
+end

data/lib/ec2launcher/version.rb

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

data/lib/ec2launcher.rb

@@ -14,6 +14,7 @@ require 'ec2launcher/dsl/application'
 require 'ec2launcher/dsl/environment'
 
 require 'ec2launcher/backoff_runner'
+require 'ec2launcher/instance_paths_config'
 require 'ec2launcher/block_device_builder'
 require 'ec2launcher/hostname_generator'
 
@@ -117,7 +118,14 @@ module EC2Launcher
       end
       @application = @applications[options.application]
 
+      ##############################
+      # INSTANCE PATHS
+      ##############################
+      @instance_paths = EC2Launcher::InstancePathsConfig.new(@environment)
+
+      ##############################
       # Initialize AWS and create EC2 connection
+      ##############################
       initialize_aws()
       @ec2 = AWS::EC2.new
 
@@ -701,11 +709,28 @@ module EC2Launcher
     # Given a string containing a command to run, replaces any inline variables.
     # Supported variables include:
     #   * @APPLICATION@ - name of the application
+    #   * @APP@ - name of the application
     #   * @ENVIRONMENT@ - name of the environment
+    #   * @ENV@ - name of the environment
+    #   * @RUBY@ - Full pathname to the ruby executable
+    #   * @GEM@ - Full pathname to the gem executable
+    #   * @CHEF@ - Full pathname to the chef-client executable
+    #   * @KNIFE@ - Full pathname to the knife executable
     #
     # @return [String] command with variables replaced
     def substitute_command_variables(cmd)
-      cmd.gsub(/@APPLICATION@/, @application.name).gsub(/@ENVIRONMENT@/, @environment.name)
+      substitutions = {
+        /@APPLICATION@/ => @application.name,
+        /@APP@/ => @application.name,
+        /@ENVIRONMENT@/ => @environment.name,
+        /@ENV@/ => @environment.name,
+        /@RUBY@/ => @instance_paths.ruby_path,
+        /@GEM@/ => @instance_paths.gem_path,
+        /@CHEF@/ => @instance_paths.chef_path,
+        /@KNIFE@/ => @instance_paths.knife_path
+      }
+      substitutions.keys.each {|key| cmd.gsub!(key, substitutions[key]) }
+      cmd
     end
 
     # Validates all settings in an application file
@@ -757,10 +782,10 @@ module EC2Launcher
         'gems' => gems,
         'packages' => packages
       }
-      setup_json["gem_path"] = build_path(@environment.gem_path, "gem", "/usr/bin/gem")
-      setup_json["ruby_path"] = build_path(@environment.ruby_path, "ruby", "/usr/bin/ruby")
-      setup_json["chef_path"] = build_path(@environment.chef_path, "chef-client", "/usr/bin/chef-client")
-      setup_json["knife_path"] = build_path(@environment.knife_path, "knife", "/usr/bin/knife")
+      setup_json["gem_path"] = @instance_paths.gem_path
+      setup_json["ruby_path"] = @instance_paths.ruby_path
+      setup_json["chef_path"] = @instance_paths.chef_path
+      setup_json["knife_path"] = @instance_paths.knife_path
 
       unless @application.block_devices.nil? || @application.block_devices.empty?
         setup_json['block_devices'] = @application.block_devices

data/startup-scripts/setup_instance.rb

@@ -183,7 +183,7 @@ end
 ##############################
 # Assembles a set of existing partitions into a RAID array.
 def assemble_raid_array(partition_list, raid_device = '/dev/md0', raid_type = 0)
-  mylog.info "Assembling cloned RAID-#{raid_type.to_s} array #{raid_device} ..."
+  puts "Assembling cloned RAID-#{raid_type.to_s} array #{raid_device} ..."
   command = "/sbin/mdadm --assemble #{raid_device} #{partition_list.join(' ')}"
   puts command
   puts `#{command}`
@@ -205,7 +205,18 @@ def setup_attached_raid_array(system_arch, devices, raid_device = '/dev/md0', ra
 
   # RAID device name can be a symlink on occasion, so we
   # want to de-reference the symlink to keep everything clear.
-	raid_info = `/sbin/mdadm --detail --scan`.split("\n")[-1].split()
+  raid_info = "/dev/md0"
+  raid_scan_info = `/sbin/mdadm --detail --scan 2>&1`
+  puts "RAID Scan Info: #{raid_scan_info}"
+  if raid_scan_info =~ /cannot open/
+    # This happens occasionally on CentOS 6:
+    #   $ /sbin/mdadm --detail --scan
+    #   mdadm: cannot open /dev/md/0_0: No such file or directory
+    #   mdadm: cannot open /dev/md/1_0: No such file or directory
+    raid_info = `ll /dev/md/0_0 |grep -v "md-device-map" |awk '// { print $9; }' |sort`.split("\n")[-1]
+  else
+    raid_info = raid_scan_info.split("\n")[-1].split()
+  end
 	Pathname.new(raid_info[1]).realpath.to_s
 end
 
@@ -257,6 +268,16 @@ end
 
 # Process EBS volumes
 unless instance_data["block_devices"].nil?
+  # Install mdadm if we have any RAID devices
+  raid_required = false
+  instance_data["block_devices"].each do |block_device_json|
+    unless block_device_json["raid_level"].nil?
+      raid_required = true
+      break
+    end
+  end
+  puts `yum install mdadm -y` if raid_required
+
 	next_device_name = "xvdj"
 	instance_data["block_devices"].each do |block_device_json|
 		if block_device_json["raid_level"].nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -54,6 +54,7 @@ files:
 - lib/ec2launcher/dsl/environment.rb
 - lib/ec2launcher/hostname_generator.rb
 - lib/ec2launcher/init_options.rb
+- lib/ec2launcher/instance_paths_config.rb
 - lib/ec2launcher/security_group_handler.rb
 - lib/ec2launcher/version.rb
 - startup-scripts/setup.rb