ec2launcher 1.0.24 → 1.0.25

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.25
+
+* Fixed duplicate commands.
+
 ## 1.0.24
 
 * Fixed typos.

data/lib/ec2launcher/version.rb

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

data/lib/ec2launcher.rb

@@ -873,7 +873,6 @@ module EC2Launcher
         commands = @options.commands.collect {|cmd| substitute_command_variables(cmd) }
         user_data += "\n" + commands.join("\n")
       end
-      @options.commands.each {|extra_cmd| user_data += "\n#{extra_cmd}" }
 
       # Post commands
       unless @environment.postcommands.nil? || @environment.postcommands.empty?

data/startup-scripts/setup_instance.rb

@@ -2,6 +2,7 @@
 
 require 'rubygems'
 
+require 'open3'
 require 'optparse'
 require 'ostruct'
 
@@ -352,21 +353,29 @@ end
 
 ##############################
 # Launch Chef
-IO.popen(chef_path) do |f|
-  while ! f.eof
-    puts f.gets
+def run_chef_client(chef_path)
+  result = 0
+  Open3.popen3(chef_path) do |stdin, stdout, stderr, wait_thr|
+    stdout.each do |line|
+      puts line
+    end
+    result = wait_thr.value
   end
+  result
 end
 
+result = run_chef_client(chef_path)
+run_chef_client(chef_path) unless result == 0
+
 ##############################
 # EMAIL NOTIFICATION
 ##############################
-if instance_data["email_notification"]
+if instance_data["email_notifications"]
   # Email notification through SES
   puts "Email notification through SES..."
   AWS.config({
-    :access_key_id => instance_data["email_notification"]["ses_access_key"],
-    :secret_access_key => instance_data["email_notification"]["ses_secret_key"]
+    :access_key_id => instance_data["email_notifications"]["ses_access_key"],
+    :secret_access_key => instance_data["email_notifications"]["ses_secret_key"]
   })
   ses = AWS::SimpleEmailService.new
   ses.send_email(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.0.24
+  version: 1.0.25
   prerelease: 
 platform: ruby
 authors: