Merge branch 'resiliency-cleanup'

slapos/recipe/request.py

@@ -140,9 +140,12 @@ class Recipe(object):
     if self.failed is not None:
       # Check instance status to know if instance has been deployed
       try:
+        if self.instance.getComputerId() is not None:
           status = self.instance.getState()
+        else:
+          status = 'not ready yet'
       except (slapmodule.NotFoundError, slapmodule.ServerError):
-        status = 'not ready yet, please try again'
+        status = 'not ready yet'
       except AttributeError:
         status = 'unknown'
       error_message = 'Connection parameter %s not found. '\
@@ -163,7 +166,10 @@ class RequestOptional(Recipe):
     if self.failed is not None:
       # Check instance status to know if instance has been deployed
       try:
+        if self.instance.getComputerId() is not None:
           status = self.instance.getState()
+        else:
+          status = 'not ready yet'
       except (slapmodule.NotFoundError, slapmodule.ServerError):
         status = 'not ready yet'
       except AttributeError:
@@ -173,3 +179,5 @@ class RequestOptional(Recipe):
           'check status of this instance.' % (self.failed, status)
       self.logger.warning(error_message)
     return []
+
+  update = install

slapos/recipe/softwaretype.py

@@ -87,7 +87,8 @@ class Recipe:
       computer_partition_id)
     self.parameter_dict = self.computer_partition.getInstanceParameterDict()
     software_type = self.parameter_dict['slap_software_type']
-    self.logger.info('Deplying instance with software type %s' % software_type)
+    self.logger.info('Deploying instance with software type %s' % \
+        software_type)
 
     if software_type not in self.options:
       if 'default' in self.options:

stack/lamp/buildout.cfg

@@ -267,6 +267,9 @@ signature-certificate-list =
   -----END CERTIFICATE-----
 
 [versions]
+# 1.2.4b doesn't download
+MySQL-python = 1.2.3
+
 Jinja2 = 2.6
 Werkzeug = 0.8.3
 apache-libcloud = 0.11.3
@@ -278,19 +281,19 @@ meld3 = 0.6.9
 pycrypto = 2.6
 rdiff-backup = 1.0.5
 slapos.cookbook = 0.67
-slapos.recipe.build = 0.11.4
+slapos.recipe.build = 0.11.5
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
-slapos.toolbox = 0.30
+slapos.toolbox = 0.31
 smmap = 0.8.2
 
 # Required by:
-# slapos.core==0.30
-# slapos.toolbox==0.30
+# slapos.core==0.31.2
+# slapos.toolbox==0.31
 Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.30
+# slapos.toolbox==0.31
 GitPython = 0.3.2.RC1
 
 # Required by:
@@ -298,11 +301,11 @@ GitPython = 0.3.2.RC1
 PyXML = 0.8.4
 
 # Required by:
-# slapos.toolbox==0.30
+# slapos.toolbox==0.31
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.30
+# slapos.toolbox==0.31
 feedparser = 5.1.2
 
 # Required by:
@@ -315,7 +318,7 @@ inotifyx = 0.2.0
 
 # Required by:
 # slapos.cookbook==0.67
-# slapos.core==0.30
+# slapos.core==0.31.2
 # xml-marshaller==0.9.7
 lxml = 3.0alpha2
 
@@ -324,15 +327,15 @@ lxml = 3.0alpha2
 netaddr = 0.7.10
 
 # Required by:
-# slapos.core==0.30
+# slapos.core==0.31.2
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.30
+# slapos.toolbox==0.31
 paramiko = 1.7.7.2
 
 # Required by:
-# slapos.toolbox==0.30
+# slapos.toolbox==0.31
 psutil = 0.6.1
 
 # Required by:
@@ -341,24 +344,24 @@ pytz = 2012f
 
 # Required by:
 # slapos.cookbook==0.67
-# slapos.core==0.30
-# slapos.toolbox==0.30
-# zc.buildout==1.6.0-dev-SlapOS-007
+# slapos.core==0.31.2
+# slapos.toolbox==0.31
+# zc.buildout==1.6.0-dev-SlapOS-010
 # zc.recipe.egg==1.3.2
 setuptools = 0.6c12dev-r88846
 
 # Required by:
 # slapos.cookbook==0.67
-# slapos.toolbox==0.30
-slapos.core = 0.30
+# slapos.toolbox==0.31
+slapos.core = 0.31.2
 
 # Required by:
-# slapos.core==0.30
+# slapos.core==0.31.2
 supervisor = 3.0b1
 
 # Required by:
 # slapos.cookbook==0.67
-# slapos.toolbox==0.30
+# slapos.toolbox==0.31
 xml-marshaller = 0.9.7
 
 # Required by:
@@ -366,5 +369,5 @@ xml-marshaller = 0.9.7
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.30
+# slapos.core==0.31.2
 zope.interface = 4.0.1

stack/slapos.cfg

@@ -59,7 +59,7 @@ eggs =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-007
+zc.buildout = 1.6.0-dev-SlapOS-010
 
 [networkcache]
 download-cache-url = http://www.shacache.org/shacache