Merge lp:~yoshimov/appscale/recovery-tools into lp:appscale/trunk-tools

[NOMURA Yoshihide]

Changed to use shutdown option instead of stop for recovery.
Fixed key directory to use /etc/appscale.

Unmerged revisions

178. By NOMURA Yoshihide on 2010-08-23

change to copy private key to db master for hypertable. (bug 586188)

177. By NOMURA Yoshihide on 2010-08-20

fix key location to use /etc/appscale.
change terminate command option.

=== modified file 'bin/appscale-add-keypair'
--- bin/appscale-add-keypair	2010-07-23 22:53:06 +0000
+++ bin/appscale-add-keypair	2010-08-24 23:26:39 +0000
@@ -47,19 +47,17 @@
 end
 FileUtils.chmod(0600, [path, pub_key])
 
-ips = node_layout.nodes.collect { |node| node.id }
-ips.each { |ip|
+node_layout.nodes.each do |node|
+  ip = node.id
   puts CommonFunctions.shell("ssh-copy-id -i #{path} root@#{ip}")
-#  puts CommonFunctions.shell("scp -i #{path} #{path} root@#{ip}:.ssh/id_rsa")
-#  puts CommonFunctions.shell("scp -i #{path} #{path} root@#{ip}:.ssh/id_dsa")
-#  puts CommonFunctions.shell("scp -i #{path} #{pub_key} root@#{ip}:.ssh/id_rsa.pub")
-}
-
-head_ip = node_layout.head_node.id
-puts CommonFunctions.shell("scp -i #{path} #{path} root@#{head_ip}:.ssh/id_rsa")
-# this is needed for EC2 integration.
-puts CommonFunctions.shell("scp -i #{path} #{path} root@#{head_ip}:.ssh/id_dsa")
-puts CommonFunctions.shell("scp -i #{path} #{pub_key} root@#{head_ip}:.ssh/id_rsa.pub")
+  # Hypertable needs private key in db master.
+  if node.is_shadow? || node.is_db_master?
+    puts CommonFunctions.shell("scp -i #{path} #{path} root@#{ip}:.ssh/id_rsa")
+    # this is needed for EC2 integration.
+    puts CommonFunctions.shell("scp -i #{path} #{path} root@#{ip}:.ssh/id_dsa")
+    puts CommonFunctions.shell("scp -i #{path} #{pub_key} root@#{ip}:.ssh/id_rsa.pub")
+  end
+end
 
 FileUtils.cp(path, backup_key)
 puts "A new ssh key has been generated for you and placed at #{path}. You can now use this key to log into any of the machines you specified without providing a password via the following command:\n\tssh [e-mail] -i #{path}"

=== modified file 'bin/appscale-run-instances'
--- bin/appscale-run-instances	2010-08-19 00:53:40 +0000
+++ bin/appscale-run-instances	2010-08-24 23:26:39 +0000
@@ -290,7 +290,7 @@
 
     puts "Copying over credentials for cloud #{cloud_num}"
 
-    cloud_key_dir = "/root/appscale/.appscale/keys/cloud#{cloud_num}"
+    cloud_key_dir = "/etc/appscale/keys/cloud#{cloud_num}"
     make_cloud_key_dir = "mkdir -p #{cloud_key_dir}"
     CommonFunctions.run_remote_command(head_node_ip,
       make_cloud_key_dir, true_key, @@verbose)
@@ -306,7 +306,7 @@
 elsif VALID_CLOUD_TYPES.include?(INFRASTRUCTURE)
     puts "Copying over credentials for cloud"
 
-    cloud_key_dir = "/root/appscale/.appscale/keys/cloud1"
+    cloud_key_dir = "/etc/appscale/keys/cloud1"
     make_cloud_key_dir = "mkdir -p #{cloud_key_dir}"
     CommonFunctions.run_remote_command(head_node_ip,
       make_cloud_key_dir, true_key, @@verbose)
@@ -317,7 +317,7 @@
     CommonFunctions.scp_file(ec2_cert, "#{cloud_key_dir}/mycert.pem", head_node_ip, true_key)
     CommonFunctions.scp_file(ec2_private_key, "#{cloud_key_dir}/mykey.pem", head_node_ip, true_key)
 else
-  cloud_key_dir = "/root/appscale/.appscale/keys/cloud1"
+  cloud_key_dir = "/etc/appscale/keys/cloud1"
   make_cloud_key_dir = "mkdir -p #{cloud_key_dir}"
   CommonFunctions.run_remote_command(head_node_ip,
     make_cloud_key_dir, true_key, @@verbose)

=== modified file 'bin/appscale-terminate-instances'
--- bin/appscale-terminate-instances	2010-08-03 16:20:01 +0000
+++ bin/appscale-terminate-instances	2010-08-24 23:26:39 +0000
@@ -102,7 +102,7 @@
   ssh_key_location = "~/.appscale/#{keyname}"
   table = CommonFunctions.get_table(keyname)
 
-  command = "service appscale-controller stop"
+  command = "service appscale-controller shutdown"
   
   boxes_shut_down = 0
   node_layout = NodeLayout.new(IPS, { :database => table }, skip_replication=true)
@@ -125,7 +125,7 @@
     STDOUT.flush
     loop {
       ps = `ssh root@#{ip} -o StrictHostkeyChecking=no -i #{ssh_key_location} 'ps x'`
-      processes_left = ps.scan(/appscale-controller stop/).length
+      processes_left = ps.scan(/appscale-controller shutdown/).length
       break if processes_left == 0
       print '.'
       STDOUT.flush