svn commit: r1131682 - in /incubator/mesos/trunk/src/ec2: deploy.lucid64/root/nexus-ec2/nexus-daemon nexus_ec2.py

[be...@apache.org]

Author: benh
Date: Sun Jun  5 04:57:08 2011
New Revision: 1131682

URL: http://svn.apache.org/viewvc?rev=1131682&view=rev
Log:
Created new AMI on which Linux containers will work by default

Modified:
    incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/nexus-daemon
    incubator/mesos/trunk/src/ec2/nexus_ec2.py

Modified: incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/nexus-daemon
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/nexus-daemon?rev=1131682&r1=1131681&r2=1131682&view=diff
==============================================================================
--- incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/nexus-daemon (original)
+++ incubator/mesos/trunk/src/ec2/deploy.lucid64/root/nexus-ec2/nexus-daemon Sun Jun  5 04:57:08 2011
@@ -26,7 +26,7 @@ if [ "$PROGRAM" == "nexus-slave" ]; then
   CPUS=`grep processor /proc/cpuinfo | wc -l`
   MEM_KB=`cat /proc/meminfo | grep MemTotal | awk '{print $2}'`
   MEM=$[(MEM_KB - 1024 * 1024) * 1024]
-  EXTRA_OPTS="--cpus $CPUS --mem $MEM"
+  EXTRA_OPTS="--cpus $CPUS --mem $MEM --isolation lxc"
 fi
 
 cd $NEXUS_HOME/src

Modified: incubator/mesos/trunk/src/ec2/nexus_ec2.py
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/ec2/nexus_ec2.py?rev=1131682&r1=1131681&r2=1131682&view=diff
==============================================================================
--- incubator/mesos/trunk/src/ec2/nexus_ec2.py (original)
+++ incubator/mesos/trunk/src/ec2/nexus_ec2.py Sun Jun  5 04:57:08 2011
@@ -32,7 +32,7 @@ def parse_args():
       help="Master instance type (leave empty for same as instance-type)")
   parser.add_option("-z", "--zone", default="us-east-1b",
       help="Availability zone to launch instances in")
-  parser.add_option("-a", "--ami", default="ami-65aa430c", # nexus-lucid-0.2
+  parser.add_option("-a", "--ami", default="ami-19a14870", # nexus-lucid-0.3
       help="Amazon Machine Image ID to use")
   parser.add_option("-o", "--os", default="lucid64",
       help="OS on the Amazon Machine Image (lucid6 | karmic64 | solaris)")