mondupe 0.0.35 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09d1178f6114f5753a0085ebd2cb18b9a00002fd
-  data.tar.gz: 13ab96c86ca846ff06af27e71bbecad50acaaa2f
+  metadata.gz: f0c20d04c3f03e2f9de9259d7e546f2cb3632638
+  data.tar.gz: 20a8340501e8455d0a93a2513ca4c84132adc191
 SHA512:
-  metadata.gz: 1ab3b7c62aeb7cabbb332da35483ea1d695014c5d6abba1f218c3b1c86c87fc011f2dfd983b60b14ac01dd8f97ca236a360f3203236c69e323649dfcf9a3c2bd
-  data.tar.gz: 725e2f6dfdf4fb4f8bc60a3cb67dbbe37bece5ecad4251028170d7092e25a99a48f75d9666e1a1a345976f9cbece8ae83e0ab92593ad5e004e94e4fcd1642584
+  metadata.gz: 48cb854703d9c1bd1f1e476b14b7073eae6e311764cee097ce35cb6bb40f935dd5922430e1a243a8d291e73ef8b2cf969402b3ef7030e2b290ae27d208d983a4
+  data.tar.gz: 9ec1fbe544eda59e97b7ff501bb5930bf5665ba2c1f3105b0116ceed5a93becd192b553a8ff293436e255a44f950293a957e9bf5ff2b4c90049bb52f49d8410b

data/bin/mondupe

@@ -113,7 +113,6 @@ opt_parser = OptionParser.new do |opt|
   opt.separator "  Optional: (have sane defaults)"
   opt.separator "   - MONDUPE_INSTANCE_IMAGE_ID"
   opt.separator "   - MONDUPE_CHEF_RUN_LIST"
-  opt.separator "   - MONDUPE_CHEF_IDENTITY_FILE"
   opt.separator "   - MONDUPE_CHEF_ENVIRONMENT"
   opt.separator "   - MONDUPE_SSH_KEY"
   opt.separator "   - MONDUPE_SSH_USER"
@@ -142,7 +141,6 @@ instance_count = 1
 chef_run_list = ENV['MONDUPE_CHEF_RUN_LIST'] || ""
 chef_environment = ENV['MONDUPE_CHEF_ENVIRONMENT'] || "default"
 ssh_key = ENV['MONDUPE_SSH_KEY'] || "~/.ssh/id_rsa"
-chef_identity_file = ENV['MONDUPE_CHEF_IDENTITY_FILE'] || ssh_key
 ssh_user = ENV['MONDUPE_SSH_USER'] || "ubuntu"
 route53_domain = ENV['MONDUPE_ROUTE53_DOMAIN'] || nil
 instance_fqdn = ( instance_name + "." + route53_domain ) unless instance_name.nil? || route53_domain.nil?
@@ -160,7 +158,7 @@ when "create"
   puts "Creating AWS EC2 Instance with MongoDB and restoring from latest production backup"
   instance = Mondupe.new.create_instance(instance_name, instance_image_id, instance_type, instance_count, security_group, key_pair_name, expire_days, instance_owner, instance_volume_size)
   Mondupe.new.create_dns(instance_fqdn, route53_domain, instance)
-  Mondupe.new.bootstrap(instance_name, instance_fqdn, instance.ip_address, chef_environment, chef_identity_file, chef_run_list, ssh_user, knife_exec)
+  Mondupe.new.bootstrap(instance_name, instance_fqdn, instance.ip_address, chef_environment, chef_run_list, ssh_key, ssh_user, knife_exec)
   Mondupe.new.get_db_dump_from_s3(instance.ip_address, s3_bucket_name, dump_tmp_path, ssh_user, dump_file_name)
   Mondupe.new.restore_db(instance.ip_address, dump_tmp_path, ssh_key, ssh_user, dump_file_name, mongo_db_name, mongo_user, mongo_pass, mongo_auth_db)
   puts " - - - Total Run Time: #{((total_seconds % 3600) / 60).to_i}m #{((total_seconds % 3600) % 60).to_i}s - - -"
@@ -169,7 +167,7 @@ when "delete"
 when "bootstrap"
   puts "bootstrapping node"
   # Find the instance and create the instance object here
-  Mondupe.new.bootstrap(instance_name, instance_fqdn, instance_host_address, chef_environment, chef_identity_file, chef_run_list, ssh_user, knife_exec)
+  Mondupe.new.bootstrap(instance_name, instance_fqdn, instance_host_address, chef_environment, chef_run_list, ssh_key, ssh_user, knife_exec)
 when "dumps3"
   puts "getting dump"
   Mondupe.new.get_db_dump_from_s3(instance_host_address, s3_bucket_name, dump_tmp_path, ssh_user, dump_file_name)

data/lib/mondupe.rb

@@ -78,33 +78,37 @@ class Mondupe
     if rrset.exists?
       # Update if record exists
       rrset.update
+      puts "Updated CNAME '#{instance_fqdn}' to point to '#{instance.ip_address}'"
     else
       # Create new record if does not exist
       rrset = zone.rrsets[instance_fqdn, 'CNAME']
       rrset.resource_records = [ { :value => instance.ip_address } ]
       rrset.update
+      puts "Added CNAME '#{instance_fqdn}' pointing to '#{instance.ip_address}'"
     end
   end
 
-  def try_command(tries, command)
+  def try_command(tries, wait, command)
     begin
       `#{command}` or raise "Failure"
     rescue
       tries -= 1
       if tries > 0
         puts "Trying again. #{tries} left."
+        sleep wait
         retry
       end
       puts "Failed after #{tries} retries..."
     end
   end
 
-  def bootstrap(instance_name, instance_fqdn, instance_ipaddress, chef_environment, chef_identity_file, chef_run_list, ssh_user, knife_exec)
+  def bootstrap(instance_name, instance_fqdn, instance_ip, chef_environment, chef_run_list, ssh_key, ssh_user, knife_exec)
     # Bootstrap the new instance with chef
     puts "Bootstraping node with Chef..."
     puts "Running..."
     #puts "#{knife_exec} bootstrap #{instance_ipaddress} -N #{instance_fqdn[0...-1]} -E #{chef_environment} -i #{chef_identity_file} -r #{chef_run_list} -x #{ssh_user} --sudo"
-    try_command(20, "#{knife_exec} bootstrap #{instance_ipaddress} -N #{instance_fqdn[0...-1]} -E #{chef_environment} -i #{chef_identity_file} -r #{chef_run_list} -x #{ssh_user} --sudo") or abort "Knife bootstrap failed"
+    try_command(20, 20, "ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} \"date\"")
+    system("#{knife_exec} bootstrap #{instance_ipaddress} -N #{instance_fqdn[0...-1]} -E #{chef_environment} -i #{ssh_key} -r #{chef_run_list} -x #{ssh_user} --sudo") or abort "Knife bootstrap failed"
   end
 
   def get_db_dump_from_s3(instance_ip, s3_bucket_name, dump_tmp_path, ssh_user, dump_file_name)
@@ -132,7 +136,7 @@ class Mondupe
     db_connect_string = "mongo #{mongo_db_name}"
     db_connect_string << " -u \"#{mongo_user}\" -p \"#{mongo_pass}\"" if !mongo_user.nil? && !mongo_pass.nil?
     db_connect_string << " --authenticationDatabase \"#{mongo_auth_db}\"" if !mongo_auth_db.nil?
-    try_command(20, "#{ssh_command} \"echo 'db.serverStatus()' | #{db_connect_string}\"") or abort "Failed to connect"
+    try_command(20, 20, "#{ssh_command} \"echo 'db.serverStatus()' | #{db_connect_string}\"") or abort "Failed to connect"
     puts "#{Time.now.to_s} - Dropping existing database"
     `#{ssh_command} "#{db_connect_string} --eval 'db.dropDatabase()'"`
     if $?.success? then puts "#{Time.now.to_s} - Database drop complete" else abort("Error dropping database") end
@@ -158,7 +162,7 @@ class Mondupe
     #puts "Connect String: #{db_connect_string}"
     puts "#{Time.now.to_s} - Running command on #{instance_dns} against #{mongo_db_name}"
     puts "JS Query: #{java_command}"
-    db_output = try_command(20, "ssh -i #{ssh_key} #{ssh_user}@#{instance_dns} \"#{db_connect_string} --eval '#{java_command}'\"") or abort "Failed to run command"
+    db_output = try_command(20, 20, "ssh -i #{ssh_key} #{ssh_user}@#{instance_dns} \"#{db_connect_string} --eval '#{java_command}'\"") or abort "Failed to run command"
     puts db_output
     if $?.success? then puts "#{Time.now.to_s} - Command execution complete" else abort("Error executing command") end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mondupe
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.37
 platform: ruby
 authors:
 - Philip Hutchins