Merge branch 'slaprunner'

component/cloud9/buildout.cfg

@@ -28,7 +28,7 @@ environment =
 # NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location}
 recipe = plone.recipe.command
 stop-on-error = true
-commit = 97db1467c517d265438684bd2a70b0b76ee282f6
+commit = bd6dd16c9ccfe4e778b41e98090e959d1462c819
 repository = https://github.com/ajaxorg/cloud9.git
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 git-binary = ${git:location}/bin/git

setup.py

@@ -43,33 +43,33 @@ setup(name=name,
           'addresiliency = slapos.recipe.addresiliency:Recipe',
           'agent = slapos.recipe.agent:Recipe',
           'apache.frontend = slapos.recipe.apache_frontend:Recipe',
+          'apache.zope.backend = slapos.recipe.apache_zope_backend:Recipe',
           'apachephp = slapos.recipe.apachephp:Recipe',
           'apacheproxy = slapos.recipe.apacheproxy:Recipe',
-          'apache.zope.backend = slapos.recipe.apache_zope_backend:Recipe',
-          'certificate_authority.request = slapos.recipe.certificate_authority:Request',
           'certificate_authority = slapos.recipe.certificate_authority:Recipe',
+          'certificate_authority.request = slapos.recipe.certificate_authority:Request',
+          'check_page_content = slapos.recipe.check_page_content:Recipe',
           'check_port_listening = slapos.recipe.check_port_listening:Recipe',
           'check_url_available = slapos.recipe.check_url_available:Recipe',
-          'check_page_content = slapos.recipe.check_page_content:Recipe',
           'cloud9 = slapos.recipe.cloud9:Recipe',
           'cloudooo.test = slapos.recipe.erp5_test:CloudoooRecipe',
-          'cron.d = slapos.recipe.dcron:Part',
           'cron = slapos.recipe.dcron:Recipe',
+          'cron.d = slapos.recipe.dcron:Part',
           'davstorage = slapos.recipe.davstorage:Recipe',
           'downloader = slapos.recipe.downloader:Recipe',
+          'dropbear = slapos.recipe.dropbear:Recipe',
           'dropbear.add_authorized_key = slapos.recipe.dropbear:AddAuthorizedKey',
           'dropbear.client = slapos.recipe.dropbear:Client',
-          'dropbear = slapos.recipe.dropbear:Recipe',
           'dumpmdb = slapos.recipe.dumpmdb:Recipe',
           'duplicity = slapos.recipe.duplicity:Recipe',
           'egg_test = slapos.recipe.erp5_test:EggTestRecipe',
           'equeue = slapos.recipe.equeue:Recipe',
           'erp5.bootstrap = slapos.recipe.erp5_bootstrap:Recipe',
           'erp5.promise = slapos.recipe.erp5_promise:Recipe',
-          'erp5scalabilitytestbed = slapos.recipe.erp5scalabilitytestbed:Recipe',
-          'erp5testnode = slapos.recipe.erp5testnode:Recipe',
           'erp5.test = slapos.recipe.erp5_test:Recipe',
           'erp5.update = slapos.recipe.erp5_update:Recipe',
+          'erp5scalabilitytestbed = slapos.recipe.erp5scalabilitytestbed:Recipe',
+          'erp5testnode = slapos.recipe.erp5testnode:Recipe',
           'firefox = slapos.recipe.firefox:Recipe',
           'fontconfig = slapos.recipe.fontconfig:Recipe',
           'generate.mac = slapos.recipe.generatemac:Recipe',
@@ -87,43 +87,43 @@ setup(name=name,
           'importmdb = slapos.recipe.importmdb:Recipe',
           'java = slapos.recipe.java:Recipe',
           'kumofs = slapos.recipe.kumofs:Recipe',
-          'kvm.frontend = slapos.recipe.kvm_frontend:Recipe',
           'kvm = slapos.recipe.kvm:Recipe',
+          'kvm.frontend = slapos.recipe.kvm_frontend:Recipe',
+          'lamp = slapos.recipe.lamp:Request',
           'lamp.request = slapos.recipe.lamp:Request',
           'lamp.simple = slapos.recipe.lamp:Simple',
-          'lamp = slapos.recipe.lamp:Request',
           'lamp.static = slapos.recipe.lamp:Static',
-          'libcloudrequest = slapos.recipe.libcloudrequest:Recipe',
           'libcloud = slapos.recipe.libcloud:Recipe',
+          'libcloudrequest = slapos.recipe.libcloudrequest:Recipe',
           'lockfile = slapos.recipe.lockfile:Recipe',
-          'logrotate.d = slapos.recipe.logrotate:Part',
           'logrotate = slapos.recipe.logrotate:Recipe',
+          'logrotate.d = slapos.recipe.logrotate:Part',
           'memcached = slapos.recipe.memcached:Recipe',
           'mkdirectory = slapos.recipe.mkdirectory:Recipe',
           'mydumper = slapos.recipe.mydumper:Recipe',
           'mysql = slapos.recipe.mysql:Recipe',
           'nbdserver = slapos.recipe.nbdserver:Recipe',
           'nosqltestbed = slapos.recipe.nosqltestbed:NoSQLTestBed',
+          'notifier = slapos.recipe.notifier:Recipe',
           'notifier.callback = slapos.recipe.notifier:Callback',
           'notifier.notify = slapos.recipe.notifier:Notify',
-          'notifier = slapos.recipe.notifier:Recipe',
           'novnc = slapos.recipe.novnc:Recipe',
           'onetimeupload = slapos.recipe.onetimeupload:Recipe',
           'pbs = slapos.recipe.pbs:Recipe',
           'postgres = slapos.recipe.postgres:Recipe',
-          'postgres.import = slapos.recipe.postgres:ImportRecipe',
           'postgres.export = slapos.recipe.postgres:ExportRecipe',
+          'postgres.import = slapos.recipe.postgres:ImportRecipe',
           'proactive = slapos.recipe.proactive:Recipe',
           'publish = slapos.recipe.publish:Recipe',
           'publishurl = slapos.recipe.publishurl:Recipe',
           'pwgen = slapos.recipe.pwgen:Recipe',
           'pwgen.stable = slapos.recipe.pwgen:StablePasswordGeneratorRecipe',
-          'requestoptional = slapos.recipe.request:RequestOptional',
           'request = slapos.recipe.request:Recipe',
+          'requestoptional = slapos.recipe.request:RequestOptional',
           'seleniumrunner = slapos.recipe.seleniumrunner:Recipe',
           'sheepdogtestbed = slapos.recipe.sheepdogtestbed:SheepDogTestBed',
-          'shellinabox = slapos.recipe.shellinabox:Recipe',
           'shell = slapos.recipe.shell:Recipe',
+          'shellinabox = slapos.recipe.shellinabox:Recipe',
           'signalwrapper= slapos.recipe.signal_wrapper:Recipe',
           'simplelogger = slapos.recipe.simplelogger:Recipe',
           'siptester = slapos.recipe.siptester:SipTesterRecipe',
@@ -136,8 +136,8 @@ setup(name=name,
           'slaprunner.test = slapos.recipe.slaprunner:Test',
           'softwaretype = slapos.recipe.softwaretype:Recipe',
           'sphinx= slapos.recipe.sphinx:Recipe',
-          'sshkeys_authority.request = slapos.recipe.sshkeys_authority:Request',
           'sshkeys_authority = slapos.recipe.sshkeys_authority:Recipe',
+          'sshkeys_authority.request = slapos.recipe.sshkeys_authority:Request',
           'stunnel = slapos.recipe.stunnel:Recipe',
           'symbolic.link = slapos.recipe.symbolic_link:Recipe',
           'tidstorage = slapos.recipe.tidstorage:Recipe',

slapos/recipe/request.py

@@ -25,9 +25,9 @@
 #
 ##############################################################################
 import logging
-
 from slapos import slap as slapmodule
 import slapos.recipe.librecipe.generic as librecipe
+import traceback
 
 DEFAULT_SOFTWARE_TYPE = 'RootSoftwareInstance'
 
@@ -125,6 +125,7 @@ class Recipe(object):
         librecipe.GenericBaseRecipe.TRUE_VALUES
 
     self._raise_request_exception = None
+    self._raise_request_exception_formatted = None
     self.instance = None
     try:
       self.instance = request(software_url, software_type,
@@ -134,6 +135,7 @@ class Recipe(object):
       options['instance_guid'] = self.instance.getId()
     except (slapmodule.NotFoundError, slapmodule.ServerError, slapmodule.ResourceNotReady) as exc:
       self._raise_request_exception = exc
+      self._raise_request_exception_formatted = traceback.format_exc()
 
     for param in return_parameters:
       options['connection-%s' % param] = ''
@@ -176,9 +178,9 @@ class RequestOptional(Recipe):
   Same as slapos.cookbook:request, but won't raise in case of problem.
   """
   def install(self):
-    if self._raise_request_exception:
+    if self._raise_request_exception_formatted:
       self.logger.warning('Optional request failed:')
-      self.logger.warning(self._raise_request_exception)
+      self.logger.warning(self._raise_request_exception_formatted)
     elif self.failed is not None:
       # Check instance status to know if instance has been deployed
       try:

slapos/recipe/softwaretype.py

@@ -93,7 +93,7 @@ class Recipe:
     # Raise if request software_type does not exist ...
     if software_type not in self.options:
       # ... Except for backward compatibility. Then use "default".
-      if software_type in ['RootSoftwareType']:
+      if software_type in ['RootSoftwareInstance']:
         software_type = 'default'
       else:
         raise zc.buildout.UserError("This software type (%s) isn't mapped." % \

software/slaprunner/software.cfg

 [buildout]
 
 extends =
-  ../../stack/slapos.cfg
-  ../../stack/flask.cfg
-  ../../stack/shacache-client.cfg
-  ../../component/dropbear/buildout.cfg
-  ../../component/git/buildout.cfg
   ../../component/cloud9/buildout.cfg
   ../../component/dash/buildout.cfg
+  ../../component/dropbear/buildout.cfg
+  ../../component/git/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+  ../../stack/flask.cfg
+  ../../stack/shacache-client.cfg
+  ../../stack/slapos.cfg
 
 parts =
   template
@@ -31,6 +32,7 @@ mode = 0644
 [eggs]
 recipe = z3c.recipe.scripts
 eggs =
+  ${lxml-python:egg}
   slapos.libnetworkcache
   slapos.toolbox[flask_auth]
   slapos.core