mondupe 0.0.37 → 0.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0c20d04c3f03e2f9de9259d7e546f2cb3632638
-  data.tar.gz: 20a8340501e8455d0a93a2513ca4c84132adc191
+  metadata.gz: 28272fa761a894d66603c535701b92dedf61b015
+  data.tar.gz: 6421d1c37d0252b30db1bfff113da6ceb44e849c
 SHA512:
-  metadata.gz: 48cb854703d9c1bd1f1e476b14b7073eae6e311764cee097ce35cb6bb40f935dd5922430e1a243a8d291e73ef8b2cf969402b3ef7030e2b290ae27d208d983a4
-  data.tar.gz: 9ec1fbe544eda59e97b7ff501bb5930bf5665ba2c1f3105b0116ceed5a93becd192b553a8ff293436e255a44f950293a957e9bf5ff2b4c90049bb52f49d8410b
+  metadata.gz: fb1b052009843d80149d582718f3f2ad4cc9436c7698b209be75607cf461d88cd7c36887f99558ac8785eaad21603f19e3356ae750af8c660f61b87a95f307c3
+  data.tar.gz: 59ff7db8618ef03104be1296e699d0ce3959922132c42f598fb52d5c973423c5d9eb6694df0160d1eb1444b45a678024e1a53dadc93c25967bd469e680dedb51

data/bin/mondupe

@@ -159,7 +159,7 @@ when "create"
   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_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.get_db_dump_from_s3(instance.ip_address, s3_bucket_name, dump_tmp_path, ssh_key, 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 - - -"
 when "delete"
@@ -170,7 +170,7 @@ when "bootstrap"
   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)
+  Mondupe.new.get_db_dump_from_s3(instance_host_address, s3_bucket_name, dump_tmp_path, ssh_key, ssh_user, dump_file_name)
 when "restore"
   puts "Restoring mongo database from dump"
   Mondupe.new.restore_db(instance_host_address, dump_tmp_path, ssh_key, ssh_user, dump_file_name, mongo_db_name, mongo_user, mongo_pass, mongo_auth_db)

data/lib/mondupe.rb

@@ -69,21 +69,21 @@ class Mondupe
   def create_dns(instance_fqdn, route53_domain, instance)
     # Set up DNS through Route53
     puts "Setting up Route53 DNS..."
+
     # Check to see if record exists
     route53 = AWS::Route53.new(:access_key_id => ENV['AWS_ACCESS_KEY_ID'], :secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'])
     zone = route53.hosted_zones.select { |z| z.name == route53_domain }.first
-
     rrsets = AWS::Route53::HostedZone.new(zone.id).rrsets
-    rrset = rrsets.create(instance_fqdn, 'CNAME', :ttl => 300, :resource_records => [{:value => instance.ip_address }])
+    rrset = rrsets[instance_fqdn, 'CNAME']
+
     if rrset.exists?
       # Update if record exists
+      rrset.resource_records = [ { :value => instance.ip_address } ]
       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
+      rrset = rrsets.create(instance_fqdn, 'CNAME', :ttl => 300, :resource_records => [{:value => instance.ip_address }])
       puts "Added CNAME '#{instance_fqdn}' pointing to '#{instance.ip_address}'"
     end
   end
@@ -111,7 +111,7 @@ class Mondupe
     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)
+  def get_db_dump_from_s3(instance_ip, s3_bucket_name, dump_tmp_path, ssh_key, ssh_user, dump_file_name)
     expiration = Time.now.to_i + 400*60
     s3 = AWS::S3.new(:access_key_id => ENV['AWS_ACCESS_KEY_ID'], :secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'])
     backups = s3.buckets[s3_bucket_name]
@@ -120,7 +120,7 @@ class Mondupe
     puts "Download URL: #{download_url}"
     puts "#{Time.now.to_s} - Starting download."
     puts "  Please wait..."
-    `ssh -i ~/.ssh/DevOps.pem #{ssh_user}@#{instance_ip} "sudo mkdir -p #{dump_tmp_path} && sudo chown #{ssh_user}:#{ssh_user} #{dump_tmp_path} && cd #{dump_tmp_path} && wget '#{download_url}' -O #{File.join(dump_tmp_path, dump_file_name)} 2&>1"`
+    `ssh -i #{ssh_key} #{ssh_user}@#{instance_ip} "sudo mkdir -p #{dump_tmp_path} && sudo chown #{ssh_user}:#{ssh_user} #{dump_tmp_path} && cd #{dump_tmp_path} && wget '#{download_url}' -O #{File.join(dump_tmp_path, dump_file_name)} 2&>1"`
     puts "#{Time.now.to_s} - Download completed"
   end
 

metadata

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