Merge branch 'hotfix-0.94.3'

Author: jtriley

Changelog

@@ -5,6 +5,29 @@ Version History
 .. contents::
     :local:
 
+.. _version-0.94.3:
+
+0.94.3
+======
+
+.. _v0943-news:
+
+News
+----
+Version 0.94.3 of StarCluster is a bug fix release. See the "Bug Fixes"
+sections below for details. In general it's recommended to terminate all
+clusters before upgrading to new versions of StarCluster although this is not
+always strictly required.
+
+.. _v0943-fixes:
+
+Bug Fixes
+---------
+* Fixed 'InvalidSnapshot.NotFound' errors on cluster launch
+* Fixed issue with Server.InternalError: Internal error on launch when using
+  m1.small instance type with a 32bit AMI.
+* Updated default AMIs in config template to 64bit AMIs
+
 .. _version-0.94.2:
 
 0.94.2
@@ -24,8 +47,8 @@ always strictly required.
 Bug Fixes
 ---------
 * node: fixed regression where the instance's connection object was not being
-reused which was causing issues for folks using regions other than the default
-us-east-1.
+  reused which was causing issues for folks using regions other than the default
+  us-east-1.
 
 .. _version-0.94.1:
 

README.rst

@@ -1,8 +1,8 @@
 ===================
-StarCluster v0.94.2
+StarCluster v0.94.3
 ===================
 :StarCluster: Cluster Computing Toolkit for the Cloud
-:Version: 0.94.2
+:Version: 0.94.3
 :Author: Justin Riley <justin.t.riley@gmail.com>
 :Team: Software Tools for Academics and Researchers (http://star.mit.edu)
 :Homepage: http://star.mit.edu/cluster

starcluster/awsutils.py

@@ -415,10 +415,13 @@ def request_instances(self, image_id, price=None, instance_type='m1.small',
         """
         if not block_device_map:
             img = self.get_image(image_id)
-            is_s3 = img.root_device_type == 'instance-store'
+            instance_store = img.root_device_type == 'instance-store'
+            if instance_type == 'm1.small' and img.architecture == "i386":
+                # Needed for m1.small + 32bit AMI (see gh-329)
+                instance_store = True
             bdmap = self.create_block_device_map(add_ephemeral_drives=True,
                                                  num_ephemeral_drives=24,
-                                                 instance_store=is_s3)
+                                                 instance_store=instance_store)
             # Prune drives from runtime block device map that may override EBS
             # volumes specified in the AMIs block device map
             for dev in img.block_device_mapping:
@@ -431,6 +434,9 @@ def request_instances(self, image_id, price=None, instance_type='m1.small',
             if img.root_device_name in img.block_device_mapping:
                 log.debug("Forcing delete_on_termination for AMI: %s" % img.id)
                 root = img.block_device_mapping[img.root_device_name]
+                # specifying the AMI's snapshot in the custom block device
+                # mapping when you dont own the AMI causes an error on launch
+                root.snapshot_id = None
                 root.delete_on_termination = True
                 bdmap[img.root_device_name] = root
             block_device_map = bdmap

starcluster/static.py

@@ -55,7 +55,7 @@ def create_sc_config_dirs():
     __makedirs(STARCLUSTER_LOG_DIR)
 
 
-VERSION = "0.94.2"
+VERSION = "0.94.3"
 PID = os.getpid()
 TMP_DIR = tempfile.gettempdir()
 if os.path.exists("/tmp"):

starcluster/templates/config.py

@@ -105,7 +105,7 @@
 # The base i386 StarCluster AMI is %(x86_ami)s
 # The base x86_64 StarCluster AMI is %(x86_64_ami)s
 # The base HVM StarCluster AMI is %(hvm_ami)s
-NODE_IMAGE_ID = %(x86_ami)s
+NODE_IMAGE_ID = %(x86_64_ami)s
 # instance type for all cluster nodes
 # (options: %(instance_types)s)
 NODE_INSTANCE_TYPE = m1.small
@@ -117,7 +117,7 @@
 #MASTER_INSTANCE_TYPE = m1.small
 # Uncomment to specify a separate AMI to use for the master node. (OPTIONAL)
 # (defaults to NODE_IMAGE_ID if not specified)
-#MASTER_IMAGE_ID = %(x86_ami)s (OPTIONAL)
+#MASTER_IMAGE_ID = %(x86_64_ami)s (OPTIONAL)
 # availability zone to launch the cluster in (OPTIONAL)
 # (automatically determined based on volumes (if any) or
 # selected by Amazon if not specified)