ec2launcher 1.6.15 → 1.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmNiNzZlYTgxNDRhZmY1YWYwYjE0NTdjMDZhNzMxYWJiMjI4NjNhMQ==
+    MWIwYTY3YTRlYTllOTUxN2E2MTI2NmI2MDdkNGY4YjZkZDRiYzZjZA==
   data.tar.gz: !binary |-
-    MWQ2OWQ5NGU1NDdlNTFlMTM3NGY3YmYyMDI1M2ViN2M2NDViYjMyNQ==
+    NGNkMzJjMjIyODE5ZWQxYTk5MGEwM2UwMTRiNDY1ZTNiNDBhNmUwNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDY5M2MwMTNlNjE4NGMxZGViZWNlZmRhMWY2ZjIwNDM1NmZhMWJhMmJmYjU0
-    OTIwZjhlNzMzMTQwOGY3ZmM4Y2VkOTQzZDRlNDNjNGYwNjgyNWM5ZjM5OTk4
-    ZTU5ZDE4MzdiZjU4M2Q5YmFmOTZkZWFiNDJlNmViMjkzNTZlNGQ=
+    OTAwNWFhYjAwZWFlYTVhMjdiMzkxODUzY2Y1YmY4MDlkZjI3ZDQ5YjBjOTc0
+    MmUwM2UxMmVkMjE5MDA5NmY0ODI1ZDlmMDIxZGZhODU1NDgxODgyOGFhMDEw
+    ODQ4YTQ3YmJmYjNlZTBmYzA5NTIwMzZjOTBjNTBiMDg3NGMwZGE=
   data.tar.gz: !binary |-
-    YmJlMWViMGQ3NGRiNTllY2UwODQ2NGExOWQxNGRmOTVhZTI0ZDRmNjI2MWQw
-    N2E0OTE0MDg1YWRmNzQzMWZlMDU3N2ZhNjk0YWExN2JhMTBkYzFjZDY4NTY4
-    MTJjODE2ZWFmYWY3Nzg2YjZmMTY3MTc4MDE3MTRmNTFiN2E1NTI=
+    MGQwYmU3NDNlMTQ5ZjQ0MTdjYjI0OTQwNDZhMWExZmQyN2IwMjYyZDc2NTE5
+    MGE2YWVjZGMwNWVhODQ2YjQwZmJkZjhmY2VmNmM2Y2VkMDEwNjAzZDczYWI1
+    YjBiNDFiZTBiMmU5Mjk1ZDEwMTI0MzIxZTRiNjMxNzdkNWM0NzE=

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.7.0
+
+* New optional "dynamic" naming convention that leverages the instance id instead of a sequential number. Useful for ASGs.
+* New command line option "--dynamic-name" that forces use of new naming convention.
+
+## 1.6.15
+
+* Fixed a problem parsing the setup JSON on MRI rubies later than 1.9.3-p194, which was the root cause of the block device handling issues.
+
 ## 1.6.14
 
 * Undo block device changes.

data/Gemfile.lock

@@ -0,0 +1,28 @@
+PATH
+  remote: .
+  specs:
+    ec2launcher (1.7.0)
+      aws-sdk (>= 1.8.0)
+      log4r
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    aws-sdk (1.9.5)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
+      uuidtools (~> 2.1)
+    json (1.7.7)
+    log4r (1.1.10)
+    minitest (4.1.0)
+    nokogiri (1.5.9)
+    rake (0.9.2.2)
+    uuidtools (2.1.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ec2launcher!
+  minitest
+  rake

data/Rakefile

@@ -1,9 +1,18 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
 require 'rake/testtask'
+
 Rake::TestTask.new do |t|
+  t.name = "testspec"
   t.libs << 'lib/ec2launcher'
-  t.test_files = FileList['test/ec2launcher/*_test.rb', "test/ec2launcher/dsl/*_test.rb"]
+  t.pattern = "test/spec/**/*_spec.rb"
   t.verbose = true
 end
-task :default => :test
+
+Rake::TestTask.new do |t|
+  t.libs << 'lib/ec2launcher'
+  t.pattern = "test/unit/**/*_test.rb"
+  t.verbose = true
+end
+
+task :default => [:test, :testspec]

data/lib/ec2launcher/block_device_builder.rb

@@ -14,10 +14,11 @@ module EC2Launcher
     attr_reader :block_device_mappings
     attr_reader :block_device_tags
 
-    # @param [AWS::EC2] ec2 interface to ec2
-    # @param [Integer, nil] volume_size size of new EBS volumes. If set to nil, uses EC2Launcher::Defaults::DEFAULT_VOLUME_SIZE.
+    # @param [AWS::EC2] ec2               Interface to ec2
+    # @param [Integer, nil] volume_size   Size of new EBS volumes. If set to nil, uses EC2Launcher::Defaults::DEFAULT_VOLUME_SIZE.
+    # @param [Log4r, nil] logger          Optional logger.
     #
-    def initialize(ec2, volume_size = nil)
+    def initialize(ec2, volume_size = nil, logger = nil)
       @ec2 = ec2
       @block_size = volume_size
       @volume_size ||= EC2Launcher::DEFAULT_VOLUME_SIZE
@@ -26,7 +27,8 @@ module EC2Launcher
       @block_device_tags = {}
 
       begin
-        @log = Log4r::Logger['ec2launcher']
+        @log = logger
+        @log ||= Log4r::Logger['ec2launcher']
       rescue
       end
 

data/lib/ec2launcher/dynamic_hostname_generator.rb

@@ -0,0 +1,56 @@
+#
+# Copyright (c) 2012-2013 Sean Laurent
+#
+require 'rubygems'
+require 'aws-sdk'
+
+require 'ec2launcher/hostnames/host_name_generation'
+
+module EC2Launcher
+  # Helper class to generate unique host names
+  class DynamicHostnameGenerator
+    include HostNames::HostNameGeneration
+
+    # Creates a new generator for dynamic host names.
+    #
+    # @param [String] prefix  Optional prefix for the hostname.
+    # @param [String] suffix  Optional suffix for the hostname.
+    def initialize(prefix = nil, suffix = nil)
+      @prefix = prefix
+      @suffix = suffix
+      
+      if prefix
+        @prefix = prefix.slice(0, prefix.length - 1) if prefix =~ /[.]$/
+      end
+
+      if suffix
+        @suffix = suffix.slice(1, suffix.length) if suffix =~ /^[.]/
+        @suffix = @suffix.slice(0, @suffix.length - 1) if @suffix =~ /[.]$/
+      end
+
+      @prefix = nil if @prefix && @prefix.size < 1
+      @suffix = nil if @suffix && @suffix.size < 1
+    end
+
+    # Given an instance id, generates a dynamic short hostname typically in the form:
+    #
+    #   prefix + INSTANCE ID + application + environment
+    #
+    # Examples:
+    #   9803da2.web.prod (no prefix)   
+    #   app-d709aa2ab.server.dev (prefix = "app-")
+    #
+    # @param [String] instance_id   AWS EC2 instance id
+    #
+    def generate_dynamic_hostname(instance_id)
+      instance_id_name = (instance_id =~ /^i-/ ? instance_id.gsub(/^i-/, '') : instance_id)
+
+      short_name = @prefix
+      short_name ||= ""
+      short_name += instance_id_name
+      short_name += ".#{@suffix}" if @suffix
+
+      short_name
+    end
+  end
+end

data/lib/ec2launcher/hostname_generator.rb

@@ -5,26 +5,32 @@ require 'rubygems'
 require 'aws-sdk'
 
 require 'ec2launcher/backoff_runner'
+require 'ec2launcher/dynamic_hostname_generator'
+require 'ec2launcher/hostnames/host_name_generation'
 
 module EC2Launcher
   # Helper class to generate sequential, numbered host names
   class HostnameGenerator
     include BackoffRunner
+    include HostNames::HostNameGeneration
+
+    attr_reader :prefix
+    attr_reader :suffix
 
     # 
     # @param [AWS::EC2] ec2 EC2 object used to query for existing instances
     # @param [EC2Launcher::Environment] environment Environment to use for generating host names
-    # @param [EC2Launcher::Application] application Application to use for generating hostn ames
+    # @param [EC2Launcher::Application] application Application to use for generating host names
     def initialize(ec2, environment, application)
       @ec2 = ec2
-      @server_name_cache = nil
+        @server_name_cache = nil
 
       @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}"
@@ -34,6 +40,27 @@ module EC2Launcher
 
       # Load and cache instance names
       load_instances(@prefix, @suffix)
+
+      @dynamic_generator = EC2Launcher::DynamicHostnameGenerator.new(nil, "#{@prefix}.#{@suffix}")
+    end
+
+    # Given an instance id, generates a dynamic short hostname typically in the form:
+    #
+    #   prefix + INSTANCE ID + application + environment
+    #
+    # Examples:
+    #   9803da2.web.prod (no prefix)   
+    #   app-d709aa2ab.server.dev (prefix = "app-")
+    #
+    # @param [String] instance_id   AWS EC2 instance id
+    #
+    def generate_dynamic_hostname(instance_id)
+      short_name = @dynamic_generator.generate_dynamic_hostname(instance_id)
+      
+      # Cache the new hostname
+      @server_name_cache << short_name
+
+      short_name
     end
 
     # Generates a new host name and automatically caches it
@@ -51,23 +78,6 @@ module EC2Launcher
       short_name
     end
 
-    def generate_long_name(short_hostname, domain_name = nil)
-      hostname = short_hostname
-      unless domain_name.nil?
-        hostname += ".#{domain_name}"
-      end
-
-      hostname
-    end
-
-    def generate_short_name(long_name, domain_name = nil)
-      short_hostname = long_name
-      unless domain_name.nil?
-        short_hostname = long_name.gsub(/.#{domain_name}/, '')
-      end
-      short_hostname
-    end
-
     private
 
     # Loads and caches instance host names

data/lib/ec2launcher/hostnames/host_name_generation.rb

@@ -0,0 +1,42 @@
+#
+# Copyright (c) 2012-2013 Sean Laurent
+#
+module EC2Launcher
+  module HostNames
+    module HostNameGeneration
+      # Given a short host name and domain name, generate a Fully Qualified Domain Name.
+      #
+      # @param [String] short_hostname  Shortened host name.
+      # @param [String] domain_name     Optional domain name ie 'example.com'
+      def generate_fqdn(short_hostname, domain_name = nil)
+        raise ArgumentError, 'short_hostname is invalid' if short_hostname.nil?
+
+        hostname = short_hostname
+        unless domain_name.nil?
+          unless hostname =~ /[.]$/ || domain_name =~ /^[.]/
+            hostname += "."
+          end
+          hostname += domain_name
+        end
+
+        hostname
+      end
+
+      # Given a FQDN and a domain name, produce a shortened version of the host name
+      # without the domain.
+      #
+      # @param [String] long_name   FQDN ie 'foo1.prod.example.com'
+      # @param [String] domain_name Optional domain name ie 'example.com'
+      def generate_short_name(long_name, domain_name = nil)
+        raise ArgumentError, 'long_name is invalid' if long_name.nil?
+
+        short_hostname = long_name
+        unless domain_name.nil?
+          short_hostname = long_name.gsub(/#{domain_name}/, '')
+          short_hostname = short_hostname.slice(0, short_hostname.length - 1) if short_hostname =~ /[.]$/
+        end
+        short_hostname
+      end
+    end
+  end
+end

data/lib/ec2launcher/init_options.rb

@@ -108,9 +108,17 @@ EOH
           @options.skip_setup = true
         end
 
+        opts.on("--pretty-print", "Use pretty format for JSON user-data. Defaults to off. Only recommended for testing.") do
+          @options.pretty_print = true
+        end
+
         opts.separator ""
         opts.separator "Launch overrides:"
 
+        opts.on("-d", "--dynamic-name", "Dynamically set the host name based on instance id.") do |dynamic_name|
+          @options.dynamic_name = dynamic_name
+        end
+
         opts.on("-h", "--hostname NAME", String, "The name for the new server.") do |hostname|
           @options.hostname = hostname
         end
@@ -192,6 +200,7 @@ EOH
       @options.skip_setup = false
 
       @options.ami_id = nil
+      @options.dynamic_name = false
       @options.hostname = nil
       @options.zone = nil
       @options.instance_type = nil
@@ -200,6 +209,7 @@ EOH
       @options.snapshot_removal = true
       @options.force = false
 
+      @options.pretty_print = false
       @options.verbosity = :normal
 
       @options.directory = "./"

data/lib/ec2launcher/route53.rb

@@ -71,12 +71,15 @@ module EC2Launcher
     #
     def delete_record_by_name(hostname, record_type = "A", log_errors = true)
       # Search for the record
+      delete_result = true
       record = find_record(hostname, record_type)
       if record
         delete_record(record.name, record.type, record.ttl, record.value, log_errors)
       else
+        delete_result = false
         @log.warn "Route53 '#{record_type}' record for '#{hostname}' not found!" if log_errors
       end
+      delete_result
     end
 
     # Deletes a DNS record from Route53.
@@ -88,6 +91,7 @@ module EC2Launcher
     # @param [Boolean] log_errors Log errors or not. False quietly ignores errors.
     #
     def delete_record(name, type, ttl, value, log_errors = true)
+      delete_result = true
       begin
         @route53.client.change_resource_record_sets({
           :hosted_zone_id => @hosted_zone_id, 
@@ -107,7 +111,9 @@ module EC2Launcher
         })
       rescue StandardError => bang
         @log.error "Error deleting A record from Route53: #{bang}" if log_errors
+        delete_result = false
       end
+      delete_result
     end
 
     # Searches for a record with the specified name and type.

data/lib/ec2launcher/version.rb

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

data/lib/ec2launcher.rb

@@ -241,36 +241,38 @@ module EC2Launcher
       ##############################
       # HOSTNAME
       ##############################
-      hostname_generator = EC2Launcher::HostnameGenerator.new(@ec2, @environment, @application)
+      @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, @domain_name)
-          short_hostnames << short_hostname
-          fqdn_names << long_hostname
-        end
-      else
-        if @options.hostname.nil?
-          short_hostname = hostname_generator.generate_hostname()
-          long_hostname = hostname_generator.generate_long_name(short_hostname, @domain_name)
+      unless @options.dynamic_name
+        if @options.count > 1
+          1.upto(@options.count).each do |i|
+            short_hostname = @hostname_generator.generate_hostname()
+            long_hostname = @hostname_generator.generate_fqdn(short_hostname, @domain_name)
+            short_hostnames << short_hostname
+            fqdn_names << long_hostname
+          end
         else
-          long_hostname = @options.hostname
-          short_hostname = hostname_generator.generate_short_name(long_hostname, @environment.domain_name)
-          if long_hostname == short_hostname
-            long_hostname = hostname_generator.generate_long_name(short_hostname, @environment.domain_name)
+          if @options.hostname.nil?
+            short_hostname = @hostname_generator.generate_hostname()
+            long_hostname = @hostname_generator.generate_fqdn(short_hostname, @domain_name)
+          else
+            long_hostname = @options.hostname
+            short_hostname = @hostname_generator.generate_short_name(long_hostname, @environment.domain_name)
+            if long_hostname == short_hostname
+              long_hostname = @hostname_generator.generate_fqdn(short_hostname, @environment.domain_name)
+            end
           end
+          short_hostnames << short_hostname
+          fqdn_names << long_hostname
         end
-        short_hostnames << short_hostname
-        fqdn_names << long_hostname
       end
 
       ##############################
       # Block devices
       ##############################
-      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)
+      @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
@@ -341,8 +343,12 @@ module EC2Launcher
         @log.info "VPC Subnet          : #{subnet} (#{cidr_block})"
       end
       @log.info ""
-      fqdn_names.each do |fqdn|
-        @log.info "Name                : #{fqdn}"
+      if @options.dynamic_name
+          @log.info "Name                : **dynamic**"
+      else
+        fqdn_names.each do |fqdn|
+          @log.info "Name                : #{fqdn}"
+        end
       end
 
       unless block_device_mappings.empty?
@@ -387,19 +393,24 @@ module EC2Launcher
       }
 
       # Quit if we're only displaying the defaults
-      if @options.show_defaults || @options.show_user_data
-        if @options.show_user_data
-          user_data = build_launch_command(
-            launch_options.merge({
-              :fqdn => fqdn_names[0],
-              :short_name => short_hostnames[0]
-            })
-          )
-          @log.info ""
-          @log.info "---user-data---"
-          @log.info user_data
-          @log.info "---user-data---"
+      exit 0 if @options.show_defaults
+
+      if @options.show_user_data
+        custom_launch_options = launch_options
+        unless @options.dynamic_name
+          custom_launch_options = launch_options.merge({
+            :fqdn => fqdn_names[0],
+            :short_name => short_hostnames[0]
+          })
         end
+
+        user_data = build_launch_command(custom_launch_options)
+
+        @log.info ""
+        @log.info "---user-data---"
+        @log.info user_data
+        @log.info "---user-data---"
+
         exit 0
       end
 
@@ -408,11 +419,20 @@ module EC2Launcher
       ##############################
       @log.warn ""
       instances = []
-      fqdn_names.each_index do |i|
-        block_device_tags = block_device_builder.generate_device_tags(fqdn_names[i], short_hostnames[i], @environment.name, @application.block_devices)
+      new_instance_names = []
+      0.upto(@options.count - 1).each do |i|
+        fqdn = nil
+        short_hostname = nil
+
+        unless @options.dynamic_name
+          fqdn = fqdn_names[i]
+          short_hostname = short_hostnames[i]
+        end
+
+        block_device_tags = @block_device_builder.generate_device_tags(fqdn, short_hostname, @environment.name, @application.block_devices)
         launch_options.merge!({
-          :fqdn => fqdn_names[i],
-          :short_name => short_hostnames[i],
+          :fqdn => fqdn,
+          :short_name => short_hostname,
           :block_device_tags => block_device_tags,
         })
         user_data = build_launch_command(launch_options)
@@ -420,16 +440,23 @@ module EC2Launcher
         instance = launch_instance(launch_options, user_data)
         instances << instance
 
+        if @options.dynamic_name
+          short_hostname = @hostname_generator.generate_dynamic_hostname(instance.id)
+          fqdn = @hostname_generator.generate_fqdn(short_hostname, @environment.domain_name)
+        end
+
         public_dns_name = get_instance_dns(instance, true)
         private_dns_name = get_instance_dns(instance, false)
-        @log.info "Launched #{fqdn_names[i]} (#{instance.id}) [#{public_dns_name} / #{private_dns_name} / #{instance.private_ip_address} ]"
+        @log.info "Launched #{fqdn} (#{instance.id}) [#{public_dns_name} / #{private_dns_name} / #{instance.private_ip_address} ]"
+
+        new_instance_names << fqdn
       end
 
       @log.info "********************"    
-      fqdn_names.each_index do |i|
+      new_instance_names.each_index do |i|
         public_dns_name = get_instance_dns(instances[i], true)
         private_dns_name = get_instance_dns(instances[i], false)
-        @log.warn "** New instance: #{fqdn_names[i]} | #{instances[i].id} | #{public_dns_name} | #{private_dns_name} | #{instances[i].private_ip_address}"
+        @log.warn "** New instance: #{new_instance_names[i]} | #{instances[i].id} | #{public_dns_name} | #{private_dns_name} | #{instances[i].private_ip_address}"
       end
 
       ##############################
@@ -633,6 +660,12 @@ module EC2Launcher
         exit 5
       end
 
+      if @options.dynamic_name
+        launch_options[:short_name] = @hostname_generator.generate_dynamic_hostname(new_instance.id)
+        launch_options[:fqdn] = @hostname_generator.generate_fqdn(launch_options[:short_name], @environment.domain_name)
+        launch_options[:block_device_tags] = @block_device_builder.generate_device_tags(launch_options[:fqdn], launch_options[:short_name], @environment.name, @application.block_devices)
+      end
+
       ##############################
       # Tag instance
       @log.info "Tagging instance..."
@@ -697,11 +730,15 @@ module EC2Launcher
       cmd
     end
 
-    def load_and_encode_file(base_path, filename)
-      pathname = File.join(base_path, filename)
+    def load_and_encode_file(pathname)
       `cat #{pathname} |gzip -f |base64`
     end
 
+    def load_and_encode_file_with_path(base_path, filename)
+      pathname = File.join(base_path, filename)
+      load_and_encode_file(pathname)
+    end
+
     # Builds the launch scripts that should run on the new instance.
     #
     # launch_options = {
@@ -739,8 +776,16 @@ module EC2Launcher
         'aws_keyfile' => launch_options[:aws_keyfile],
         'gems' => launch_options[:gems],
         'packages' => launch_options[:packages],
-        'provisioned_iops' => false
+        'provisioned_iops' => false,
+        'dynamic_name' => @options.dynamic_name,
+        'domain_name' => @environment.domain_name
       }
+      if @options.dynamic_name
+        # setup_json['dynamic_name_prefix'] = @hostname_generator.prefix
+        setup_json['dynamic_name_suffix'] = "#{@hostname_generator.prefix}.#{@hostname_generator.suffix}"
+        setup_json['route53_zone_id'] = @route53_zone_id
+      end
+
       setup_json["gem_path"] = @instance_paths.gem_path
       setup_json["ruby_path"] = @instance_paths.ruby_path
       setup_json["chef_path"] = @instance_paths.chef_path
@@ -762,10 +807,11 @@ module EC2Launcher
 
       ##############################
       # Build launch command
+      json_text = @options.pretty_print ? JSON.pretty_generate(setup_json) : setup_json.to_json
       user_data = <<EOF
 #!/bin/bash
 cat > /tmp/setup.json <<End-Of-Message-JSON
-#{setup_json.to_json}
+#{json_text}
 End-Of-Message-JSON
 EOF
       if @environment.use_rvm or @application.use_rvm
@@ -783,15 +829,15 @@ EOF
 
       unless @options.skip_setup
         if @run_url_script_cache.nil?
-          @run_url_script_cache = load_and_encode_file(@startup_scripts_dir, "runurl")
+          @run_url_script_cache = load_and_encode_file_with_path(@startup_scripts_dir, "runurl")
         end
 
         if @setup_script_cache.nil?
-          @setup_script_cache = load_and_encode_file(@startup_scripts_dir, "setup.rb")
+          @setup_script_cache = load_and_encode_file_with_path(@startup_scripts_dir, "setup.rb")
         end
 
         if @setup_instance_script_cache.nil?
-          @setup_instance_script_cache = load_and_encode_file(@startup_scripts_dir, "setup_instance.rb")
+          @setup_instance_script_cache = load_and_encode_file_with_path(@startup_scripts_dir, "setup_instance.rb")
         end
 
         # runurl script
@@ -822,9 +868,11 @@ EOF
 
         user_data += "\ngem install ec2launcher --no-ri --no-rdoc"
 
-        user_data += "\n#{setup_json['ruby_path']} /tmp/setup.rb -e #{@environment.name} -a #{@application.name} -h #{launch_options[:fqdn]} /tmp/setup.json"
+        user_data += "\n#{setup_json['ruby_path']} /tmp/setup.rb -e #{@environment.name} -a #{@application.name}" 
+        user_data += " -h #{launch_options[:fqdn]}" if launch_options[:fqdn]
+        user_data += " /tmp/setup.json"
         user_data += " -c #{@options.clone_host}" unless @options.clone_host.nil?
-        user_data += " 2>&1 > /var/log/cloud-startup.log"
+        user_data += " &> /var/log/cloud-startup.log"
       end
 
       # Add extra requested commands to the launch sequence