ec2launcher 1.0.10 → 1.0.11

data/lib/ec2launcher.rb

@@ -6,14 +6,16 @@ require 'optparse'
 require 'ostruct'
 require 'aws-sdk'
 
-require "ec2launcher/version"
-require "ec2launcher/config"
-require "ec2launcher/defaults"
-require "ec2launcher/backoff_runner"
+require 'ec2launcher/version'
+require 'ec2launcher/defaults'
 
-require 'ec2launcher/application'
-require 'ec2launcher/environment'
+require 'ec2launcher/dsl/config'
+require 'ec2launcher/dsl/application'
+require 'ec2launcher/dsl/environment'
+
+require 'ec2launcher/backoff_runner'
 require 'ec2launcher/block_device_builder'
+require 'ec2launcher/hostname_generator'
 
 module EC2Launcher
 
@@ -60,7 +62,7 @@ module EC2Launcher
           filename = File.join(app_dir, application_name)
           next if File.directory?(filename)
 
-          apps = EC2Launcher::ApplicationDSL.execute(File.read(filename)).applications
+          apps = EC2Launcher::DSL::ApplicationDSL.execute(File.read(filename)).applications
           apps.each do |new_application|
             @applications[new_application.name] = new_application
             validate_application(filename, new_application)
@@ -199,28 +201,36 @@ module EC2Launcher
       ##############################
       # HOSTNAME
       ##############################
-      hostname = @options.hostname
-      if hostname.nil?
-        short_hostname = generate_hostname()
-        hostname = short_hostname
-
-        unless @environment.domain_name.nil?
-          hostname += ".#{@environment.domain_name}"
+      hostname_generator = EC2Launcher::HostnameGenerator.new(@ec2, @environment, @application)
+      short_hostnames = []
+      fqdn_names = []
+      if @options.count > 1
+        1.upto(@options.count).each do |i|
+          short_hostname = hostname_generator.generate_hostname()
+          long_hostname = hostname_generator.generate_long_name(short_hostname, @environment.domain_name)
+          short_hostnames << short_hostname
+          fqdn_names << long_hostname
         end
       else
-        short_hostname = hostname
-        unless @environment.domain_name.nil?
-          short_hostname = hostname.gsub(/.#{@environment.domain_name}/, '')
+        if @options.hostname.nil?
+          short_hostname = hostname_generator.generate_hostname()
+          long_hostname = hostname_generator.generate_long_name(short_hostname, @environment.domain_name)
+        else
+          long_hostname = @options.hostname
+          short_hostname = hostname_generator.generate_short_name(short_hostname, @environment.domain_name)
+          if long_hostname == short_hostname
+            long_hostname = hostname_generator.generate_long_name(short_hostname, @environment.domain_name)
+          end
         end
+        short_hostnames << short_hostname
+        fqdn_names << long_hostname
       end
 
       ##############################
       # Block devices
       ##############################
-      builder = EC2Launcher::BlockDeviceBuilder.new(@ec2, @options.volume_size)
-      builder.generate_block_devices(hostname, short_hostname, instance_type, @environment, @application, @options.clone_host)
-      block_device_mappings = builder.block_device_mappings
-      block_device_tags = builder.block_device_tags
+      block_device_builder = EC2Launcher::BlockDeviceBuilder.new(@ec2, @options.volume_size)
+      block_device_mappings = block_device_builder.generate_block_devices(instance_type, @environment, @application, @options.clone_host)
 
       ##############################
       # ELB
@@ -268,54 +278,6 @@ module EC2Launcher
       ##############################
       aws_keyfile = @environment.aws_keyfile
 
-      ##############################
-      # Build JSON for setup scripts
-      ##############################
-      setup_json = {
-        'hostname' => hostname,
-        'short_hostname' => short_hostname,
-        'roles' => roles,
-        'chef_server_url' => @environment.chef_server_url,
-        'chef_validation_pem_url' => chef_validation_pem_url,
-        'aws_keyfile' => aws_keyfile,
-        'gems' => gems,
-        'packages' => packages
-      }
-      unless @application.block_devices.nil? || @application.block_devices.empty?
-        setup_json['block_devices'] = @application.block_devices
-      end
-      unless email_notifications.nil?
-        setup_json['email_notifications'] = email_notifications
-      end
-
-      ##############################
-      # Build launch command
-      user_data = "#!/bin/sh
-export HOME=/root
-echo '#{setup_json.to_json}' > /tmp/setup.json"
-
-      # pre-commands, if necessary
-      unless @environment.precommands.nil? || @environment.precommands.empty?
-        precommands = @environment.precommands.join("\n")
-        user_data += "\n" + precommands
-      end
-
-      # Primary setup script
-      user_data += "\ncurl http://bazaar.launchpad.net/~alestic/runurl/trunk/download/head:/runurl-20090817053347-o2e56z7xwq8m9tt6-1/runurl -o /tmp/runurl
-chmod +x /tmp/runurl
-/tmp/runurl https://raw.github.com/StudyBlue/ec2launcher/master/startup-scripts/setup.rb -e #{@environment.name} -a #{@application.name} -h #{hostname} /tmp/setup.json > /var/log/cloud-startup.log
-rm -f /tmp/runurl"
-      user_data += " -c #{options.clone_host}" unless options.clone_host.nil?
-
-      # Add extra requested commands to the launch sequence
-      options.commands.each {|extra_cmd| user_data += "\n#{extra_cmd}" }
-
-      # Post commands
-      unless @environment.postcommands.nil? || @environment.postcommands.empty?
-        postcommands = @environment.postcommands.join("\n")
-        user_data += "\n" + postcommands
-      end
-
       ##############################
       puts
       puts "Availability zone: #{availability_zone}"
@@ -325,7 +287,6 @@ rm -f /tmp/runurl"
       puts "Architecture        : #{instance_architecture}"
       puts "AMI name            : #{ami.ami_name}"
       puts "AMI id              : #{ami.ami_id}"
-      puts "Name                : #{hostname}"
       puts "ELB                 : #{elb_name}" if elb_name
       puts "Chef PEM            : #{chef_validation_pem_url}"
       puts "AWS key file        : #{aws_keyfile}"
@@ -333,8 +294,14 @@ rm -f /tmp/runurl"
       puts "Gems                : #{gems.join(', ')}"
       puts "Packages            : #{packages.join(', ')}"
       puts "VPC Subnet          : #{subnet}" if subnet
+      puts ""
+      fqdn_names.each do |fqdn|
+        puts "Name                : #{fqdn}"
+      end
 
       unless block_device_mappings.empty?
+        puts ""
+        puts "Block devices     :"
         block_device_mappings.keys.sort.each do |key|
           if block_device_mappings[key] =~ /^ephemeral/
               puts "  Block device   : #{key}, #{block_device_mappings[key]}"
@@ -346,10 +313,6 @@ rm -f /tmp/runurl"
         end
       end
 
-      puts "User data:"
-      puts user_data
-      puts
-
       if chef_validation_pem_url.nil?
         puts "***ERROR*** Missing the URL For the Chef Validation PEM file."
         exit 3
@@ -361,22 +324,24 @@ rm -f /tmp/runurl"
       ##############################
       # Launch the new intance
       ##############################
-      instance = launch_instance(hostname, ami.ami_id, availability_zone, key_name, security_group_ids, instance_type, user_data, block_device_mappings, block_device_tags, subnet)
+      instances = []
+      fqdn_names.each_index do |i|
+        block_device_tags = block_device_builder.generate_device_tags(fqdn[i], short_hostnames[i], @environment.name, @application.block_devices)
+        instances << launch_instance(fqdn[i], ami.ami_id, availability_zone, key_name, security_group_ids, instance_type, user_data, block_device_mappings, block_device_tags, subnet)
+
+        puts "Launched #{fqdn[i]} (#{instance.id}) [#{instance.public_dns_name} / #{instance.private_dns_name} / #{instance.private_ip_address} ]"
+      end
 
       ##############################
       # ELB
       ##############################
-      attach_to_elb(instance, elb_name) unless elb_name.nil?
+      unless elb_name.nil?
+        instances.each {|instance| attach_to_elb(instance, elb_name) }
+      end
 
       ##############################
       # COMPLETED
       ##############################
-      puts ""
-      puts "Hostname   : #{hostname}"
-      puts "Instance id: #{instance.id}"
-      puts "Public dns : #{instance.public_dns_name}"
-      puts "Private dns: #{instance.private_dns_name}"
-      puts "Private ip : #{instance.private_ip_address}"
       puts "********************"    
     end
 
@@ -511,68 +476,6 @@ rm -f /tmp/runurl"
       })
     end
 
-    # Generates a new hostname based on:
-    #   * application base name
-    #   * application name
-    #   * application suffix
-    #   * environment short name
-    #   * environment name
-    #
-    def generate_hostname()
-      puts "Calculating host name..."
-
-      prefix = @application.basename
-      prefix ||= @application.name
-
-      env_suffix = @environment.short_name
-      env_suffix ||= @environment.name
-      
-      suffix = env_suffix
-      unless @application.name_suffix.nil?
-        suffix = "#{@application.name_suffix}.#{env_suffix}"
-      end
-
-      regex = Regexp.new("#{prefix}(\\d+)[.]#{suffix.gsub(/[.]/, "[.]")}.*")
-
-      server_numbers = []
-
-      highest_server_number = 0
-      lowest_server_number = 32768
-      AWS.memoize do
-        server_instances = @ec2.instances.filter("tag:Name", "#{prefix}*#{suffix}*")
-        server_instances.each do |i|
-          next if i.status == :terminated
-          server_name = i.tags[:Name]
-          unless regex.match(server_name).nil?
-            server_num = $1.to_i
-            server_numbers << server_num
-          end
-        end
-        highest_server_number = server_numbers.max
-      end
-
-      # If the highest number server is less than 10, just add
-      # 1 to it. Otherwise, find the first available
-      # server number starting at 1.
-      host_number = 0
-      if highest_server_number.nil?
-        host_number = 1
-      elsif highest_server_number < 10
-        host_number = highest_server_number + 1
-      else
-        # Try to start over with 1 and find the
-        # first available host number
-        server_number_set = Set.new(server_numbers)
-        host_number = 1
-        while server_number_set.include?(host_number) do
-            host_number += 1
-        end
-      end
-
-      short_hostname = "#{prefix}#{host_number}.#{suffix}"
-      short_hostname
-    end
-
     # Launches an EC2 instance.
     #
     # @param [String] FQDN for the new host.
@@ -654,7 +557,7 @@ rm -f /tmp/runurl"
       # Load configuration file
       config_filename = File.join(@options.directory, "config.rb")
       abort("Unable to find 'config.rb' in '#{@options.directory}'") unless File.exists?(config_filename)
-      EC2Launcher::ConfigDSL.execute(File.read(config_filename)).config
+      EC2Launcher::DSL::ConfigDSL.execute(File.read(config_filename)).config
     end
 
     # Load and parse an environment file
@@ -672,7 +575,7 @@ rm -f /tmp/runurl"
         return nil
       end
 
-      load_env = EC2Launcher::Environment.new
+      load_env = EC2Launcher::DSL::Environment.new
       load_env.load(File.read(name))
       load_env
     end
@@ -746,7 +649,7 @@ rm -f /tmp/runurl"
     # Validates all settings in an application file
     #
     # @param [String] filename name of the application file
-    # @param [EC2Launcher::Application] application application object to validate
+    # @param [EC2Launcher::DSL::Application] application application object to validate
     #
     def validate_application(filename, application)
       unless application.availability_zone.nil? || AVAILABILITY_ZONES.include?(application.availability_zone)
@@ -761,12 +664,72 @@ rm -f /tmp/runurl"
     # Validates all settings in an environment file
     #
     # @param [String] filename name of the environment file
-    # @param [EC2Launcher::Environment] environment environment object to validate
+    # @param [EC2Launcher::DSL::Environment] environment environment object to validate
     #
     def validate_environment(filename, environment)
       unless environment.availability_zone.nil? || AVAILABILITY_ZONES.include?(environment.availability_zone)
         abort("Invalid availability zone '#{environment.availability_zone}' in environment '#{environment.name}' (#{filename})")
       end
     end
+
+    # Builds the launch scripts that should run on the new instance.
+    #
+    # @param [String] fqdn Fully qualified hostname
+    # @param [String] short_name Short hostname without the domain
+    # @param [String] chef_validation_pem_url URL For the Chef validation pem file
+    # @param [String] aws_keyfile Name of the AWS key to use
+    # @param [Array<String>] gems List of gems to pre-install
+    # @param [Array<String>] packages List of packages to pre-install
+    # @param [EC2Launcher::DSL::EmailNotifications] email_notifications Email notification settings for launch updates
+    #
+    # @return [String] Launch commands to pass into new instance as userdata
+    def build_launch_command(fqdn, short_hostname, chef_validation_pem_url, aws_keyfile, gems, packages, email_notifications)
+      # Build JSON for setup scripts
+      setup_json = {
+        'hostname' => fqdn,
+        'short_hostname' => short_hostname,
+        'roles' => roles,
+        'chef_server_url' => @environment.chef_server_url,
+        'chef_validation_pem_url' => chef_validation_pem_url,
+        'aws_keyfile' => aws_keyfile,
+        'gems' => gems,
+        'packages' => packages
+      }
+      unless @application.block_devices.nil? || @application.block_devices.empty?
+        setup_json['block_devices'] = @application.block_devices
+      end
+      unless email_notifications.nil?
+        setup_json['email_notifications'] = email_notifications
+      end
+
+      ##############################
+      # Build launch command
+      user_data = "#!/bin/sh
+export HOME=/root
+echo '#{setup_json.to_json}' > /tmp/setup.json"
+
+      # pre-commands, if necessary
+      unless @environment.precommands.nil? || @environment.precommands.empty?
+        precommands = @environment.precommands.join("\n")
+        user_data += "\n" + precommands
+      end
+
+      # Primary setup script
+      user_data += "\ncurl http://bazaar.launchpad.net/~alestic/runurl/trunk/download/head:/runurl-20090817053347-o2e56z7xwq8m9tt6-1/runurl -o /tmp/runurl
+chmod +x /tmp/runurl
+/tmp/runurl https://raw.github.com/StudyBlue/ec2launcher/master/startup-scripts/setup.rb -e #{@environment.name} -a #{@application.name} -h #{hostname} /tmp/setup.json > /var/log/cloud-startup.log
+rm -f /tmp/runurl"
+      user_data += " -c #{options.clone_host}" unless options.clone_host.nil?
+
+      # Add extra requested commands to the launch sequence
+      options.commands.each {|extra_cmd| user_data += "\n#{extra_cmd}" }
+
+      # Post commands
+      unless @environment.postcommands.nil? || @environment.postcommands.empty?
+        postcommands = @environment.postcommands.join("\n")
+        user_data += "\n" + postcommands
+      end
+      user_data
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -44,14 +44,15 @@ files:
 - bin/ec2launcher
 - ec2launcher.gemspec
 - lib/ec2launcher.rb
-- lib/ec2launcher/application.rb
 - lib/ec2launcher/backoff_runner.rb
-- lib/ec2launcher/block_device.rb
 - lib/ec2launcher/block_device_builder.rb
-- lib/ec2launcher/config.rb
 - lib/ec2launcher/defaults.rb
-- lib/ec2launcher/email_notification.rb
-- lib/ec2launcher/environment.rb
+- lib/ec2launcher/dsl/application.rb
+- lib/ec2launcher/dsl/block_device.rb
+- lib/ec2launcher/dsl/config.rb
+- lib/ec2launcher/dsl/email_notification.rb
+- lib/ec2launcher/dsl/environment.rb
+- lib/ec2launcher/hostname_generator.rb
 - lib/ec2launcher/init_options.rb
 - lib/ec2launcher/security_group_handler.rb
 - lib/ec2launcher/version.rb

data/lib/ec2launcher/application.rb

@@ -1,295 +0,0 @@
-#
-# Copyright (c) 2012 Sean Laurent
-#
-require 'ec2launcher/block_device'
-require 'ec2launcher/email_notification'
-require 'ec2launcher/security_group_handler'
-
-module EC2Launcher
-	# Wrapper class to handle loading Application blocks.
-	class ApplicationDSL
-		attr_accessor :applications
-
-		def initialize
-			self.applications = []
-		end
-
-		def application(name, &block)
-			application = Application.new(name)
-			applications << application
-			application.instance_eval &block
-			application
-		end
-
-		def self.execute(dsl)
-			new.tap do |context|
-				context.instance_eval(dsl)
-			end
-		end
-	end
-
-	# Represents a single application stack.
-	class Application
-		include EC2Launcher::EmailNotifications
-		include EC2Launcher::SecurityGroupHandler
-
-		attr_reader :name
-
-		def initialize(name)
-			@name = name
-			@email_notifications = nil
-		end
-
-		def application(name)
-			@name = name
-			yield self
-			self
-		end
-
-		# Name of the AMI to use for new instances. Optional.
-		# Can be either a string or a regular expression.
-		#
-		# @param [Array, nil] Either an array of parameters or nil to return the AMI name.
-		def ami_name(*ami_name)
-			if ami_name.empty?
-				@ami_name
-			else
-				if ami_name[0].kind_of? String
-					@ami_name = /#{ami_name[0]}/
-				else
-					@ami_name = ami_name[0]
-				end
-				self
-			end
-		end
-
-		# Name of the availability zone to use for new instances. Optional.
-		# Must be one of EC2Launcher::AVAILABILITY_ZONES.
-		def availability_zone(*zone)
-			if zone.empty?
-				@availability_zone
-			else
-				@availability_zone = zone[0].to_s
-				self
-			end
-		end
-
-		# Defines a shorter name when building a host name for new instances. Optional.
-		# By default, new instances are named using the full application name. If you 
-		# specify basename, it will be used instead. Typically, this is used if you 
-		# want a shorter version of the full application name.
-		def basename(*name)
-			if name.empty?
-				@basename
-			else
-				@basename = name[0]
-				self
-			end
-		end
-
-		def block_devices(*block_device_data)
-			if block_device_data.empty?
-				@block_devices
-			else
-				self
-			end
-		end
-
-		def block_device(&block)
-			@block_devices = [] if @block_devices.nil?
-			device = EC2Launcher::BlockDevice.new
-			device.instance_exec(&block)
-			@block_devices << device
-		end
-
-		# Indicates the Amazon Elastic Load Balancer to which new instances should be
-		# attached after launch. Optional.
-		#
-		# The value can be either a String, indicating the name of the ELB, or a Hash
-		# that maps environment names to ELB names.
-		def elb(*elb)
-			if elb.empty?
-				@elb
-			else
-				@elb = Hash.new if @elb.nil?
-				if elb[0].kind_of? Hash
-					elb[0].keys.each {|key| @elb[key] = elb[0][key]}
-				else
-					@elb["default"] = elb[0].to_s
-				end
-				self
-			end
-		end
-
-		# Retrieves the ELB name for a given environment.
-		def elb_for_environment(environment)
-			elb_name = @elb[environment]
-			elb_name ||= @elb["default"]
-			elb_name
-		end
-
-		# Defines an Array of Chef roles that should be applied to new
-		# instances for a specific environment. Can be specified multiple times.
-		#
-		# Expects two parameters:
-		#   * Name of an environment
-		#   * Either the name of a single Chef role or an Array of Chef roles
-		def environment_roles(*data)
-			if data.empty?
-				@environment_roles
-			else
-				@environment_roles = Hash.new if @environment_roles.nil?
-				env_name = data[0]
-				env_roles = data[1]
-
-				environment_data = @environment_roles[env_name]
-				environment_data ||= []
-
-				if env_roles.kind_of? Array
-					environment_data += env_roles
-				else
-					environment_data << env_roles
-				end
-				@environment_roles[env_name] = environment_data
-
-				self
-			end
-		end
-
-		# Gems to install. Optional.
-		#
-		# Expects either a single String naming a gem to install or
-		# an Array of gems.
-		#
-		# Can be specified multiple times.
-		def gems(*gems)
-			if gems.empty?
-				@gems
-			else
-				@gems = [] if @gems.nil?
-				if gems[0].kind_of? Array
-					@gems += gems[0]
-				else
-					@gems << gems[0]
-				end
-				self
-			end
-		end
-
-		# Indicates that this application should inherit all of its settings from another named application.
-		# Optional.
-		def inherit(*inherit_type)
-			if inherit_type.empty?
-				@inherit_type
-			else
-				@inherit_type = inherit_type[0]
-			end
-		end
-
-		# The Amazon EC2 instance type that should be used for new instances.
-		# Must be one of EC2Launcher::INSTANCE_TYPES.
-		def instance_type(*type_name)
-			if type_name.empty?
-				@instance_type
-			else
-				@instance_type = type_name[0]
-				self
-			end
-		end
-
-		# Takes values from the other server type and merges them into this one
-		def merge(other_server)
-			@name = other_server.name
-			@ami_name = other_server.ami_name unless other_server.ami_name.nil?
-			@availability_zone = other_server.availability_zone unless other_server.availability_zone.nil?
-			@basename = other_server.basename unless other_server.basename.nil?
-			other_server.block_devices.each {|bd| @block_devices << bd } unless other_server.block_devices.nil?
-			other_server.elb.keys.each {|env_name| @elb[env_name] = other_server.elb[env_name] } unless other_server.elb.nil?
-			@instance_type = other_server.instance_type unless other_server.instance_type.nil?
-			@name_suffix = other_server.name_suffix unless other_server.name_suffix.nil?
-			other_server.roles.each {|role| @roles << role } unless other_server.roles.nil?
-			unless other_server.security_groups.nil?
-				other_server.security_groups.keys.each do |env_name|
-					unless @security_groups.has_key? env_name
-						@security_groups[env_name] = []
-					end
-					other_server.security_groups[env_name].each {|sg| @security_groups[env_name] << sg }
-				end
-			end
-		end
-
-		def name_suffix(*suffix)
-			if suffix.empty?
-				@name_suffix
-			else
-				@name_suffix = suffix[0]
-			end
-		end
-
-		def packages(*packages)
-			if packages.empty?
-				@packages
-			else
-				@packages = packages[0]
-				self
-			end
-		end
-
-		def roles(*roles)
-			if roles.empty?
-				@roles
-			else
-				@roles = [] if @roles.nil?
-				if roles[0].kind_of? Array
-					@roles += roles[0]
-				else
-					@roles = []
-					@roles << roles[0]
-				end
-				self
-			end
-		end
-
-		def roles_for_environment(environment)
-			roles = []
-			roles += @roles unless @roles.nil?
-
-			unless @environment_roles.nil? || @environment_roles[environment].nil?
-				roles += @environment_roles[environment]
-			end
-			roles
-		end
-
-		# Retrieves the list of Security Group names for the specified environment.
-		#
-		# @return [Array] Returns the list of security groups for the environment. Returns
-		#                 the security groups for the "defaukt" environment if the requested
-		#                 environment is undefined. Returns an empty Array if both the
-		#                 requested environment and "default" environment are undefined.
-		def security_groups_for_environment(environment)
-			groups = @security_groups[environment]
-			groups ||= @security_groups["default"]
-			groups ||= []
-			groups
-		end
-
-		def subnet(*subnet)
-			if subnet.empty?
-				@subnet
-			else
-				@subnet = subnet[0]
-				self
-			end
-		end
-
-		def load(dsl)
-			self.instance_eval(dsl)
-			self
-		end
-
-		def self.load(dsl)
-			env = Application.new.instance_eval(dsl)
-			env
-		end
-	end
-end