mondupe 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34fd78b237de1808b0864a03c5849ec4502a775e
-  data.tar.gz: a07ddd4d9f5bc36c9d2495158cb2661c8b460434
+  metadata.gz: e7d703857e8d7c12215b8cbb9bb707777fc7c6d7
+  data.tar.gz: f1c44d57c2d7d8acc440cd67d2da43efd6214b73
 SHA512:
-  metadata.gz: 3ebc59372c5391aa062007d073a8742719077a59a6084094d951fe526b01b90501a25b33e3f119fb2032710d7f108141f3988af7b86a0fe42556e25bc8ad2c4b
-  data.tar.gz: 455bb2195c14051966791fb1a15effb331ecd10fdab9c55a2a1bbb6fe82058a45d5e3880e02c9da285851ff22ccf2abc6b701a98e4e33ca75b7c6ebf43fdafe4
+  metadata.gz: 3a1bd390cece32936cc9dc0f8f5f7305b3933f143ab92184b99928c428d8634910260633155a82fb4fe869d618721402d9322507a0c4a4d5c1865e88a6f59d20
+  data.tar.gz: 9008e32d33169ac451c15d97b0b976dc6df9cf015cfa6f138b7b9c0d8262e59f47546a155bf8a77809f58e1d491407af8ba944768452c2ffb6316c50e89d9bd0

data/bin/mondupe

@@ -113,6 +113,7 @@ key_pair_name = ENV['MONDUPE_KEY_PAIR_NAME'] || nil
 security_group = ENV['MONDUPE_SECURITY_GROUP'] || nil
 s3_bucket_name = ENV['MONDUPE_S3_BUCKET_NAME'] || nil
 dump_file_name = ENV['MONDUPE_DUMP_FILE_NAME'] || 'mongodb.dump.tgz'
+knife_exec = ENV['MONDUPE_KNIFE_EXEC'] || 'knife'
 instance_volume_size = 60
 
 case ARGV[0]
@@ -122,7 +123,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)
+  Mondupe.new.bootstrap(instance_name, instance_fqdn, instance.ip_address, chef_environment, chef_identity_file, chef_run_list, 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)
   puts " - - - Total Run Time: #{((total_seconds % 3600) / 60).to_i}m #{((total_seconds % 3600) % 60).to_i}s - - -"
@@ -131,7 +132,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_ipaddress, chef_environment, chef_identity_file, chef_run_list, ssh_user)
+  Mondupe.new.bootstrap(instance_name, instance_fqdn, instance_ipaddress, chef_environment, chef_identity_file, chef_run_list, ssh_user, knife_exec)
 when "dumps3"
   puts "getting dump"
   Mondupe.new.get_db_dump_from_s3(instance_ipaddress, s3_bucket_name, dump_tmp_path, ssh_user, dump_file_name)

data/lib/mondupe.rb

@@ -4,12 +4,9 @@ require 'aws-sdk'
 
 class Mondupe
   def create_instance(instance_name, instance_image_id, instance_type, instance_count, security_group, key_pair_name, expire_days, instance_owner, instance_volume_size)
-    AWS.config(:access_key_id => ENV['AWS_ACCESS_KEY_ID'], :secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'], region: 'us-east-1')
+    #AWS.config(:access_key_id => ENV['AWS_ACCESS_KEY_ID'], :secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'], region: 'us-east-1')
 
     ec2 = AWS::EC2.new(:access_key_id => ENV['AWS_ACCESS_KEY_ID'], :secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'])
-
-    puts "Creating with - Security Group: #{security_group} Instance Owner: #{instance_owner}"
-
     key_pair = ec2.key_pairs[key_pair_name]
 
     # Use this to create a new security group - Can have preset options
@@ -27,7 +24,7 @@ class Mondupe
       }],
       :instance_type => instance_type,
       :count => instance_count,
-      :security_groups => security_group,
+      :security_groups => [ security_group ],
       :key_pair => key_pair
     )
 
@@ -90,13 +87,13 @@ class Mondupe
   end
 
 
-  def bootstrap(instance_name, instance_fqdn, instance_ipaddress, chef_environment, chef_identity_file, chef_run_list, ssh_user)
+  def bootstrap(instance_name, instance_fqdn, instance_ipaddress, chef_environment, chef_identity_file, chef_run_list, ssh_user, knife_exec)
     # Bootstrap the new instance with chef
     puts "Bootstraping node with Chef..."
     puts "Running..."
-    puts "knife bootstrap #{instance_ipaddress} -N #{instance_fqdn[0...-1]} -E #{chef_environment} -i #{chef_identity_file} -r #{chef_run_list} -x #{ssh_user} --sudo"
+    #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"
     sleep 30
-    system("knife bootstrap #{instance_ipaddress} -N #{instance_fqdn[0...-1]} -E #{chef_environment} -i #{chef_identity_file} -r #{chef_run_list} -x #{ssh_user} --sudo")
+    system("#{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")
   end
 
   def get_db_dump_from_s3(instance_ip, s3_bucket_name, dump_tmp_path, ssh_user, dump_file_name)
@@ -117,11 +114,11 @@ class Mondupe
     # TODO - Fail the process if any step fails
     puts "#{Time.now.to_s} - Dropping existing database"
     `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "echo 'db.dropDatabase()' | mongo cde_production"`
-    puts "#{Time.now.to_s} - Database drop complete"
+    if $?.success? then puts "#{Time.now.to_s} - Database drop complete" else die("Error dropping database") end
     puts "Restoring Mongo Database from extracted dump: #{File.join(dump_tmp_path, "cde_production")}"
-    `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "cd /tmp; tar xf #{dump_file_name}; time mongorestore /tmp/cde_production"`
+    `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "cd #{dump_tmp_path}; tar xf #{dump_file_name}; time mongorestore /tmp/cde_production"`
     puts "Removing database archive file"
-    `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "rm -rf /tmp/#{File.join(dump_tmp_path, dump_file_name)}"`
+    `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "rm -rf #{File.join(dump_tmp_path, dump_file_name)}"`
     puts "#{Time.now.to_s} - Removing saved searches"
     `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "mongo cde_production --eval \\"db.users.update({save_searches: {$ne: null}}, {$unset: {save_searches: ''}}, {multi: true})\\""`
     puts "#{Time.now.to_s} - Cleaning up our mess..."

metadata

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