Merge lp:~cgb-cs/appscale/tools-cloud-as-xen-support into lp:appscale/trunk-tools

[Chris Bunch]

[Navraj Chohan (nchohan)]

review: Disapprove

Unmerged revisions

277. By Chris Bunch on 2011-09-17

changed tools to accept public and private ips given by the user, so that they can utilize ec2/euca boxes for xen-style deployments

276. By Navraj Chohan on 2011-09-11

merged with java blobstore app

=== modified file 'bin/appscale-add-keypair'
--- bin/appscale-add-keypair	2010-12-24 23:33:40 +0000
+++ bin/appscale-add-keypair	2011-09-28 16:25:23 +0000
@@ -83,19 +83,33 @@
 copy_success = true
 
 ips.each { |ip|
-  puts "\n\n"  
-  puts "Executing ssh-copy-id for host : " + ip
+  # Users can utilize boxes with public and private IPs for Xen-like
+  # deployments by specifying public ip / private ip. If they have
+  # specified both IPs, only use the public ip.
+
+  public_ip = ip
+  private_ip = ip
+
+  if ip.include?("/")
+    public_ip, private_ip = ip.split("/")
+  end
+
+  public_ip.strip!
+  private_ip.strip!
+
+  puts "\n\n"
+  puts "Executing ssh-copy-id for host : " + public_ip
   puts "------------------------------"
 
   if auto
-    puts CommonFunctions.shell("#{expect_script} root@#{ip} #{path} #{password}")
+    puts CommonFunctions.shell("#{expect_script} root@#{public_ip} #{path} #{password}")
   else
-    puts CommonFunctions.shell("ssh-copy-id -i #{path} root@#{ip}")
+    puts CommonFunctions.shell("ssh-copy-id -i #{path} root@#{public_ip}")
   end
-  
-  #Checking the exit status of the above shell command
+
+  # Checking the exit status of the above shell command
   if $?.to_i != 0
-    puts "\n\nERROR ! Unable to ssh-copy-id to host : "+ip
+    puts "\n\nERROR ! Unable to ssh-copy-id to host : " + public_ip
     puts "\nTerminating script"
     copy_success = false
     break
@@ -104,11 +118,18 @@
 
 if copy_success
   head_ip = node_layout.head_node.id
+
+  if head_ip.include?("/")
+    head_ip, _ = head_ip.split("/")
+    head_ip.strip!
+  end
+
   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")
-  
+
   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}"
 end
+

=== modified file 'lib/vm_tools.rb'
--- lib/vm_tools.rb	2011-07-27 21:13:07 +0000
+++ lib/vm_tools.rb	2011-09-28 16:25:23 +0000
@@ -309,15 +309,28 @@
     locations = locations.flatten.to_s
     return locations
   end
+
+   def self.spawn_head_node_via_vmm(node, keyname, head_node_jobs)
+     # We don't care about the instance's ID if not using cloud-tools
+
+     # If deploying over locally managed Xen boxes, public ip = private ip
+     # Otherwise, the user has to give us the public and private IPs
+
+     public_ip = node.id
+     private_ip = node.id
+
+     if node.id.include?("/")
+       public_ip, private_ip = node.id.split("/")
+     end
+
+     public_ip.strip!
+     private_ip.strip!
+ 
+     head_node = "#{public_ip}:#{private_ip}:#{head_node_jobs}:i-ZFOOBARZ:cloud1"
+     locations = [head_node].flatten.to_s
+     return locations
+   end
   
-  def self.spawn_head_node_via_vmm(node, keyname, head_node_jobs)
-    # We don't care about the instance's ID if not using cloud-tools
-    # and for Xen, public ip = private ip
-    head_node = "#{node.id}:#{node.id}:#{head_node_jobs}:i-ZFOOBARZ:cloud1"
-    locations = [head_node].flatten.to_s
-    return locations
-  end
-
   def self.get_cloud_creds(node_layout)
     cloud_creds = {
       "machine" => "#{MACHINE}",