ec2launcher 1.0.19 → 1.0.20

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.0.20
+
+* New command line option to show user-data.
+* New command line option to skip the setup scripts.
+* Changes to handling RAID array assembly from cloned EBS volumes. Specifically arrays created with mdadm < 3.1.2 that don't use version 1.2 superblocks.
+* Fixed typo with cloning/mounting single volumes.
+* Cleaned up launch output.
+
 ## 1.0.19
 
 * Fixed typo in launch command.

data/lib/ec2launcher.rb

@@ -341,7 +341,16 @@ module EC2Launcher
       end
 
       # Quit if we're only displaying the defaults
-      exit 0 if @options.show_defaults
+      if @options.show_defaults || @options.show_user_data
+        if @options.show_user_data
+          user_data = build_launch_command(fqdn_names[0], short_hostnames[0], roles, chef_validation_pem_url, aws_keyfile, gems, packages, email_notifications)
+          puts ""
+          puts "---user-data---"
+          puts user_data
+          puts "---user-data---"
+        end
+        exit 0
+      end
 
       ##############################
       # Launch the new intance
@@ -362,9 +371,9 @@ module EC2Launcher
 
       puts "********************"    
       fqdn_names.each_index do |i|
-        public_dns_name = instances[i].public_dns_name.nil? ? "no public dns" : instances[i].public_dns_name
-        private_dns_name = instances[i].private_dns_name.nil? ? "no private dns" : instances[i].private_dns_name
-        puts "Launched #{fqdn_names[i]} (#{instances[i].id}) [#{public_dns_name} / #{private_dns_name} / #{instances[i].private_ip_address} ]"
+        public_dns_name = instances[i].public_dns_name.nil? ? "n/a" : instances[i].public_dns_name
+        private_dns_name = instances[i].private_dns_name.nil? ? "n/a" : instances[i].private_dns_name
+        puts "** New instance: #{fqdn_names[i]} | #{instances[i].id} | #{public_dns_name} | #{private_dns_name} | #{instances[i].private_ip_address}"
       end
 
       ##############################
@@ -808,37 +817,39 @@ module EC2Launcher
 
       user_data += "\n"
 
-      if @run_url_script_cache.nil?
-        puts "Downloading runurl script from #{RUN_URL_SCRIPT}"
-        @run_url_script_cache = `curl -s #{RUN_URL_SCRIPT} |gzip -f |base64`
-      end
+      unless @options.skip_setup
+        if @run_url_script_cache.nil?
+          puts "Downloading runurl script from #{RUN_URL_SCRIPT}"
+          @run_url_script_cache = `curl -s #{RUN_URL_SCRIPT} |gzip -f |base64`
+        end
 
-      if @setup_script_cache.nil?
-        puts "Downloading setup script from #{SETUP_SCRIPT}"
-        @setup_script_cache = `curl -s #{SETUP_SCRIPT} |gzip -f |base64`
-      end
+        if @setup_script_cache.nil?
+          puts "Downloading setup script from #{SETUP_SCRIPT}"
+          @setup_script_cache = `curl -s #{SETUP_SCRIPT} |gzip -f |base64`
+        end
 
-      # runurl script
-      user_data += "cat > /tmp/runurl.gz.base64 <<End-Of-Message\n"
-      user_data += @run_url_script_cache
-      user_data += "End-Of-Message"
+        # runurl script
+        user_data += "cat > /tmp/runurl.gz.base64 <<End-Of-Message\n"
+        user_data += @run_url_script_cache
+        user_data += "End-Of-Message"
 
-      # setup script
-      user_data += "\ncat > /tmp/setup.rb.gz.base64 <<End-Of-Message2\n"
-      user_data += @setup_script_cache
-      user_data += "End-Of-Message2"
+        # setup script
+        user_data += "\ncat > /tmp/setup.rb.gz.base64 <<End-Of-Message2\n"
+        user_data += @setup_script_cache
+        user_data += "End-Of-Message2"
 
-      user_data += "\nbase64 -d /tmp/runurl.gz.base64 | gunzip > /tmp/runurl"
-      user_data += "\nchmod +x /tmp/runurl"
-      # user_data += "\nrm -f /tmp/runurl.gz.base64"
+        user_data += "\nbase64 -d /tmp/runurl.gz.base64 | gunzip > /tmp/runurl"
+        user_data += "\nchmod +x /tmp/runurl"
+        # user_data += "\nrm -f /tmp/runurl.gz.base64"
 
-      user_data += "\nbase64 -d /tmp/setup.rb.gz.base64 | gunzip > /tmp/setup.rb"
-      user_data += "\nchmod +x /tmp/setup.rb"
-      # user_data += "\nrm -f /tmp/setup.rb.gz.base64"
+        user_data += "\nbase64 -d /tmp/setup.rb.gz.base64 | gunzip > /tmp/setup.rb"
+        user_data += "\nchmod +x /tmp/setup.rb"
+        # user_data += "\nrm -f /tmp/setup.rb.gz.base64"
 
-      user_data += "\n#{setup_json['ruby_path']} /tmp/setup.rb -e #{@environment.name} -a #{@application.name} -h #{fqdn} /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 += "\n#{setup_json['ruby_path']} /tmp/setup.rb -e #{@environment.name} -a #{@application.name} -h #{fqdn} /tmp/setup.json"
+        user_data += " -c #{@options.clone_host}" unless @options.clone_host.nil?
+        user_data += " 2>&1 > /var/log/cloud-startup.log"
+      end
 
       # Add extra requested commands to the launch sequence
       unless @options.commands.nil?

data/lib/ec2launcher/dsl/config.rb

@@ -78,38 +78,6 @@ end
           @config_manager = config_manager[0]
         end
       end
-
-      def gem_path(*gem_path)
-        if gem_path.empty?
-          @gem_path
-        else
-          @gem_path = gem_path[0]
-        end
-      end
-
-      def ruby_path(*ruby_path)
-        if ruby_path.empty?
-          @ruby_path
-        else
-          @ruby_path = ruby_path[0]
-        end
-      end
-
-      def chef_path(*chef_path)
-        if chef_path.empty?
-          @chef_path
-        else
-          @chef_path = chef_path[0]
-        end
-      end
-
-      def knife_path(*knife_path)
-        if knife_path.empty?
-          @knife_path
-        else
-          @knife_path = knife_path[0]
-        end
-      end
     end
   end
 end

data/lib/ec2launcher/init_options.rb

@@ -33,10 +33,14 @@ module EC2Launcher
           @options.list = true
         end
 
-        opts.on("-s", "--show-defaults", "Show settings, but do not launch any instances.") do
+        opts.on("-s", "--show-defaults", "Show settings, but do not launch any instances. Does not display user-data.") do
           @options.show_defaults = true
         end
 
+        opts.on("--show-user-data", "Show user-data, but do not launch any instances.") do
+          @options.show_user_data = true
+        end
+
         opts.separator ""
         opts.separator "Required Launch options:"
 
@@ -63,6 +67,10 @@ module EC2Launcher
           @options.count = count
         end
 
+        opts.on("--skip-setup", "Skip running the setup scripts. Still runs pre/post commands.") do
+          @options.skip_setup = true
+        end
+
         opts.separator ""
         opts.separator "Overrides:"
 
@@ -129,12 +137,14 @@ module EC2Launcher
       @options = OpenStruct.new
       @options.list = false
       @options.show_defaults = false
+      @options.show_user_data = false
 
       @options.environ = nil
       @options.application = nil
       @options.commands = []
       @options.clone_host = nil
       @options.count = 1
+      @options.skip_setup = false
 
       @options.ami_id = nil
       @options.hostname = nil

data/lib/ec2launcher/version.rb

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

data/startup-scripts/setup_instance.rb

@@ -213,11 +213,23 @@ def setup_attached_raid_array(system_arch, devices, raid_device = '/dev/md0', ra
     #   $ /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]
+    #
+    # This is tied to how the raid array was created, especially if the array was created with an older version of mdadm. 
+    # See https://bugzilla.redhat.com/show_bug.cgi?id=606481 for a lengthy discussion. We should really be naming RAID 
+    # arrays correctly and using the HOMEHOST setting to re-assemble it.
+    #
+    # As a stop-gap, try to use the specified raid_device name passed into this method.
+    raid_info = raid_device
+
+    # We need to manually retrieve the UUID of the array
+    array_uuid = `mdadm --detail #{raid_device}|grep UUID|awk '// { print $3; }'`.strip
+
+    # We have to manually update mdadm.conf as well
+    `echo ARRAY #{raid_device} level=raid#{raid_type.to_s} num-devices=#{devices.count.to_s} meta-data=0.90 UUID=#{array_uuid} |tee -a /etc/mdadm.conf`
   else
-    raid_info = raid_scan_info.split("\n")[-1].split()
+    raid_info = raid_scan_info.split("\n")[-1].split()[1]
   end
-	Pathname.new(raid_info[1]).realpath.to_s
+	Pathname.new(raid_info).realpath.to_s
 end
 
 def build_block_devices(count, device = "xvdj", &block)
@@ -278,6 +290,7 @@ unless instance_data["block_devices"].nil?
   end
   puts `yum install mdadm -y` if raid_required
 
+  raid_array_count = 0
 	next_device_name = "xvdj"
 	instance_data["block_devices"].each do |block_device_json|
 		if block_device_json["raid_level"].nil?
@@ -286,7 +299,7 @@ unless instance_data["block_devices"].nil?
 				partition_devices([ "/dev/#{next_device_name}" ])
 				format_filesystem(system_arch, "/dev/#{next_device_name}1")
 			end
-			mount_device("#{next_device_name}1", block_device_json["mount_point"], block_device_json["owner"], block_device_json["group"], default_fs_type)
+			mount_device("/dev/#{next_device_name}1", block_device_json["mount_point"], block_device_json["owner"], block_device_json["group"], default_fs_type)
 			next_device_name.next!
 		else
 			raid_devices = []
@@ -294,8 +307,9 @@ unless instance_data["block_devices"].nil?
 				raid_devices << "/dev/#{device_name}"
 				next_device_name = device_name
 			end
-			raid_device_name = setup_attached_raid_array(system_arch, raid_devices, "/dev/md0", block_device_json["raid_level"].to_i, ! options.clone_host.nil?)
+			raid_device_name = setup_attached_raid_array(system_arch, raid_devices, "/dev/md#{(127 - raid_array_count).to_s}", block_device_json["raid_level"].to_i, ! options.clone_host.nil?)
 			mount_device(raid_device_name, block_device_json["mount_point"], block_device_json["owner"], block_device_json["group"], default_fs_type)
+      raid_array_count += 1
 		end
 	end
 end

metadata

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