ec2launcher 1.6.4 → 1.6.5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.6.5
+
+* Make more methods of BlockDeviceBuilder public.
+
 ## 1.6.4
 
 * Fixed bug with properly inheriting environment roles in applications.

data/lib/ec2launcher.rb

@@ -23,8 +23,6 @@ require 'ec2launcher/route53'
 
 require 'ec2launcher/config_wrapper'
 
-include Log4r
-
 module EC2Launcher
 
   class AmiDetails
@@ -48,12 +46,19 @@ module EC2Launcher
       @setup_script_cache = nil
       @setup_instance_script_cache = nil
 
-      @log = Logger.new 'ec2launcher'
-      log_output = Outputter.stdout
-      log_output.formatter = PatternFormatter.new :pattern => "%m"
-      @log.outputters = log_output
+      begin
+        @log = Log4r::Logger['ec2launcher']
+        unless @log
+          @log = Log4r::Logger.new 'ec2launcher'
+          log_output = Log4r::Outputter.stdout
+          log_output.formatter = PatternFormatter.new :pattern => "%m"
+          @log.outputters = log_output
+        end
+      rescue
+      end
     end
 
+    public
     def launch(options)
       @options = options
 
@@ -434,7 +439,8 @@ module EC2Launcher
       ##############################
       # COMPLETED
       ##############################
-      @log.info "********************"    
+      @log.info "********************"
+      instances
     end
 
     # Attaches an instance to the specified ELB.
@@ -542,6 +548,7 @@ module EC2Launcher
     #
     # @return [String] DNS for the instance or "n/a" if undefined.
     #
+    public
     def get_instance_dns(ec2_instance, public = true)
       dns_name = public ? ec2_instance.public_dns_name : ec2_instance.private_dns_name
       dns_name.nil? ? "n/a" : dns_name
@@ -570,6 +577,7 @@ module EC2Launcher
     # }
     #
     # @return [AWS::EC2::Instance] newly created EC2 instance or nil if the launch failed.
+    public
     def launch_instance(launch_options, user_data)
       @log.warn "Launching instance... #{launch_options[:fqdn]}"
       new_instance = nil

data/lib/ec2launcher/block_device_builder.rb

@@ -5,8 +5,6 @@ require 'ec2launcher/defaults'
 require 'ec2launcher/backoff_runner'
 require 'log4r'
 
-include Log4r
-
 module EC2Launcher
   # Helper class to build EC2 block device definitions.
   #
@@ -86,8 +84,6 @@ module EC2Launcher
       block_device_tags
     end
 
-    private
-  
     # Iterates over a number of block_devices, executing the specified Ruby block.
     #
     # @param [Integer] count number of block devices
@@ -95,6 +91,7 @@ module EC2Launcher
     #        Incremented for each iteration.
     # @param [Block] block block to execute. Passes in the current device name and zero-based index.
     #
+    private
     def build_block_devices(count, device = "sdf", &block)
       device_name = device
       0.upto(count - 1).each do |index|
@@ -108,6 +105,7 @@ module EC2Launcher
     # @param [Hash<String, Hash>] block_device_mappings Mapping of device names to EBS block device details.
     # @param [Array<EC2Launcher::BlockDevice>] block_devices list of block devices to create.
     #
+    private
     def build_ebs_volumes(block_device_mappings, block_devices)
       return if block_devices.nil?
       base_device_name = "sdf"
@@ -131,6 +129,7 @@ module EC2Launcher
     # @param [Hash<String, Hash>] block_devices Map of device names to EC2 block device details.
     # @param [String] instance_type type of instance. See EC2Launcher::Defaults::INSTANCE_TYPES.
     #
+    private
     def build_ephemeral_drives(block_device_mappings, instance_type)
       ephemeral_drive_count = case instance_type
         when "m1.small" then 1
@@ -159,6 +158,7 @@ module EC2Launcher
     # @param [EC2Launcher::Application] application current application
     # @param [String] clone_host name of host to clone
     #
+    private
     def clone_volumes(block_device_mappings, application, clone_host = nil)
       return if clone_host.nil?
 
@@ -183,12 +183,12 @@ module EC2Launcher
       AWS.stop_memoizing
     end
 
-    private
     # @param [String] purpose purpose of RAID array, which is stored in the `purpose` tag for snapshots/volumes
     #        and is part of the snapshot name.
     # @param [AWS::EC2::SnapshotCollection] snapshots collection of snapshots to examine
     #
     # @return [Array<AWS::EC2::Snapshot>] list of matching snapshots
+    private
     def build_snapshot_clone_list(purpose, snapshots)
       snapshot_name_regex = /#{purpose} raid.*/
       host_snapshots = []
@@ -206,11 +206,11 @@ module EC2Launcher
       host_snapshots
     end
 
-    private
     # Creates a mapping of volume numbers to snapshots.
     #
     # @param [Array<AWS::EC2::Snapshot>] snapshots list of matching snapshots
     # @result [Hash<String, AWS::EC2::Snapshot>] map of volume numbers as strings  ("1", "2", etc.) to snapshots
+    private
     def bucket_snapshots_by_volume_number(snapshots)
       snapshot_buckets = { }
       volume_number_regex = /raid \((\d)\)$/
@@ -233,10 +233,10 @@ module EC2Launcher
       snapshot_buckets
     end
 
-    private
     # Find the most recent backup time that all snapshots have in common.
     #
     # @param [Hash<String, AWS::EC2::Snapshot>] snapshot_buckets map of volume numbers as strings  ("1", "2", etc.) to snapshots
+    public
     def get_most_recent_common_snapshot_time(snapshot_buckets)
       # We need to find the most recent backup time that all snapshots have in common.
       #
@@ -261,7 +261,6 @@ module EC2Launcher
       most_recent_dates[0]
     end
 
-    public
     # Retrieves the latest set of completed snapshots for a RAID array of EBS volumes.
     #
     # Volumes must have the following tags:
@@ -276,12 +275,12 @@ module EC2Launcher
     #
     # @return [Hash<Integer, AWS::EC2::Snapshot>] mapping of RAID device numbers (zero based) to AWS Snapshots.
     #
+    public
     def get_latest_raid_snapshot_mapping(hostname, purpose, count)
       @log.info "Retrieving list of snapshots ..."
       result = @ec2.snapshots.tagged("host").tagged_values(hostname).tagged("volumeName").tagged_values("*raid*").tagged("time")
 
       @log.info "Building list of snapshots to clone (#{purpose}) for '#{hostname}'..."
-      snapshot_name_regex = /#{purpose} raid.*/
       host_snapshots = build_snapshot_clone_list(purpose, result)
 
       # Bucket the snapshots based on volume number e.g. "raid (1)" vs "raid (2)"
@@ -326,6 +325,7 @@ module EC2Launcher
     #
     # @return [AWS::EC2::Snapshot, nil] matching snapshot or nil if no matching snapshot
     #
+    public
     def get_latest_snapshot_by_purpose(clone_host, purpose)
       @log.info "Retrieving snapshtos for #{clone_host} [#{purpose}]"
       results = @ec2.snapshots.tagged("host").tagged_values(clone_host).tagged("purpose").tagged_values(purpose)

data/lib/ec2launcher/version.rb

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

data/startup-scripts/setup_instance.rb

@@ -443,8 +443,11 @@ EOF
   # Creates a mount point, mounts the device and adds it to fstab
   def mount_device(device, mount_point, owner, group, fs_type)
     puts `echo #{device} #{mount_point} #{fs_type} noatime 0 0|tee -a /etc/fstab`
+    puts "Making mount directory #{mount_point} for #{device}"
     puts `mkdir -p #{mount_point}`
+    puts "Mounting #{device} at #{mount_point}"
     puts `mount #{mount_point}`
+    puts "Setting ownership on #{mount_point} to #{owner}"
     puts `chown #{owner}:#{owner} #{mount_point}`
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk