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

[Chris Bunch]

[Navraj Chohan (nchohan)]

review: Disapprove

Unmerged revisions

787. By Chris Bunch on 2011-09-17

adding ability for appcontroller to use different IPs for Xen-style deployments (e.g., public and private ips)

786. By Navraj Chohan <email address hidden> on 2011-08-30

disabled firewall

785. By root <root@appscale-image0> on 2011-08-19

added redisdb to AppScale

784. By root <root@perl> on 2011-08-10

public to private ips where needed

783. By root <root@lucid> on 2011-08-06

apt-get update before adding python tools

782. By root <root@appscale-image0> on 2011-08-06

updates to build; mysql fix

=== modified file 'AppController/djinn.rb'
--- AppController/djinn.rb	2011-09-18 03:02:52 +0000
+++ AppController/djinn.rb	2011-09-28 16:25:10 +0000
@@ -1332,11 +1332,23 @@
           machine, instance_type, keyname, infrastructure, "cloud1")
       else
         nodes.each_pair do |ip,roles|
-          # for xen the public and private ips are the same
+          # If deploying over locally managed Xen boxes, public ip = private ip
+          # Otherwise, the user has to give us the public and private IPs
+
           # and we call it cloud1 since the first key (only key)
           # is the key to use
-
-          info = "#{ip}:#{ip}:#{roles}:i-SGOOBARZ:cloud1"
+ 
+          public_ip = ip
+          private_ip = ip
+
+          if ip.include?("/")
+            public_ip, private_ip = ip.split("/")
+          end
+
+          public_ip.strip!
+          private_ip.strip!
+
+          info = "#{public_ip}:#{private_ip}:#{roles}:i-SGOOBARZ:cloud1"
           appengine_info << info
           Djinn.log_debug("Received appengine info: #{info}")
         end