mondupe 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f8139a0406c4d85e95e322a4804e657845f9099
-  data.tar.gz: cc6c8a2673d079d725a5d2eb4d81d3a52b9074e8
+  metadata.gz: 6a79d6631458afdf13ec9d697b34bc29c5d22667
+  data.tar.gz: 92374bfcbcceba911d3cbbfa4eeae0decf536691
 SHA512:
-  metadata.gz: 1871528995cd081a4a1c5a03ba56f991a1a5b3bfba72839326305e22eb62740b24912b84c4607ca350ab69cdac0ee28c801660ec5fea6cf10bb933e20898ab85
-  data.tar.gz: 6cce9cebaa9192536040905a729c9c08a416f0239909ac20be70a763ddcbbdf6c890656494ea43dc23864ca38e167a8fbe12952749799476e16496bc90823e44
+  metadata.gz: 6c5cd79ec61992e07cf46098bfc1051e36d9dcf7449729a693e28cbe23b06a21660e011ab769cd23016a4af74b93a2c97f21b8cac176df0d8919a9a9326fa1fe
+  data.tar.gz: 893025cabc05f8eba9c676cd16454b7a818d50d48a88787dd628c26158f83586bb96f75d461edf9bde53b4cd288deae13fb062d56831cfbb5bca311791466acf

data/bin/mondupe

@@ -13,21 +13,21 @@ opt_parser = OptionParser.new do |opt|
   opt.separator "Commands           Description"
   opt.separator "      create     - create new mongo host."
   opt.separator "                    Requires -n [name]"
-  opt.separator "                    Optional -i [image] -e [expire_days] -o [owner] -t [type] -a [ipaddress] -s [size]"
+  opt.separator "                    Optional -i [image] -e [expire_days] -o [owner] -t [type] -a [host_address] -s [size]"
   opt.separator "      delete     - delete existing mongo host."
   opt.separator "                    Requires -n [name] || -d [id]"
   opt.separator "      bootstrap  - push chef-client and configuration to the node."
-  opt.separator "                    Requires -n [name] -a [ipaddress]"
+  opt.separator "                    Requires -n [name] -a [host_address]"
   opt.separator "      dumps3     - retrieve the database dump from s3."
-  opt.separator "                    Requires -n [name] -a [ipaddress]"
+  opt.separator "                    Requires -n [name] -a [host_address]"
   opt.separator "      restore    - Restore a mongo dump that exists on a host"
-  opt.separator "                    Requires -n [name] -a [ipaddress]"
+  opt.separator "                    Requires -n [name] -a [host_address]"
   opt.separator "                    Optional -t [tmpdir] -u [mongo_username] -p [mongo_password] -c [mongo_authdb]"
   opt.separator "      execute    - Execute some java script against database"
   opt.separator "                    Requires -n [name] -a [dns_address] -x '[javascript]'"
   opt.separator "                    Optional -r [db_name]"
   opt.separator "      expire     - (coming soon) Reset the expiration days of a node"
-  opt.separator "                    Requires ( -n [name] || -d [id] || -a [ipaddress] ) -e [expire_days]"
+  opt.separator "                    Requires ( -n [name] || -d [id] || -a [host_address] ) -e [expire_days]"
   opt.separator "      list       - (coming soon) List all mongo hosts."
   opt.separator "      help       - Get help."
   opt.separator ""
@@ -57,8 +57,8 @@ opt_parser = OptionParser.new do |opt|
     $options[:type] = type
   end
 
-  opt.on("-a","--ipaddress IPADDRESS","IP address of node that already exists. Not to be used with creating new nodes") do |address|
-    $options[:ipaddress] = address
+  opt.on("-a","--address HOST_ADDRESS","IP or DNS address of node that already exists. Not to be used with creating new nodes") do |address|
+    $options[:host_address] = address
   end
 
   opt.on("-d","--id INSTANCE_ID","AWS ID of the instance, must exist already") do |id|
@@ -128,7 +128,7 @@ instance_image_id = $options[:image] || ENV['MONDUPE_INSTANCE_IMAGE_ID'] || "ami
 instance_type = $options[:type] || "m3.xlarge"
 instance_name = $options[:name] || nil
 instance_owner = $options[:owner] || ENV['USER'] || 'mondupe'
-instance_ipaddress = $options[:ipaddress] || nil
+instance_host_address = $options[:host_address] || nil
 instance_id = $options[:id] || nil
 dump_tmp_path = $options[:tmpdir] || '/tmp'
 expire_days = $options[:expire_days] || 3
@@ -168,16 +168,16 @@ 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, knife_exec)
+  Mondupe.new.bootstrap(instance_name, instance_fqdn, instance_host_address, 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)
+  Mondupe.new.get_db_dump_from_s3(instance_host_address, s3_bucket_name, dump_tmp_path, ssh_user, dump_file_name)
 when "restore"
   puts "Restoring mongo database from dump"
-  Mondupe.new.restore_db(instance_ipaddress, dump_tmp_path, ssh_key, ssh_user, dump_file_name, mongo_db_name, mongo_user, mongo_pass, mongo_auth_db)
+  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)
 when 'execute'
   puts "Executing JS against database"
-  Mondupe.new.execute_js(instance_ipaddress, ssh_key, ssh_user, java_string, mongo_db_name, mongo_user, mongo_pass, mongo_auth_db)
+  Mondupe.new.execute_js(instance_host_address, ssh_key, ssh_user, java_string, mongo_db_name, mongo_user, mongo_pass, mongo_auth_db)
 when "terminate"
   puts "Marking instance for termination"
   Mondupe.new.terminate_instance(instance_id)

data/lib/mondupe.rb

@@ -155,7 +155,8 @@ class Mondupe
     db_connect_string << " --authenticationDatabase \"#{mongo_auth_db}\"" if !mongo_auth_db.nil?
     puts "Connect String: #{db_connect_string}"
     puts "#{Time.now.to_s} - Running command on #{instance_dns} against #{mongo_db_name}"
-    `ssh -i #{ssh_key} #{ssh_user}@#{instance_dns} "echo '#{java_command}' | #{db_connect_string}"`
+    db_output = `ssh -i #{ssh_key} #{ssh_user}@#{instance_dns} "echo '#{java_command}' | #{db_connect_string}"`
+    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.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Philip Hutchins