Merge branch 'master' into erp5-cluster

Conflicts:
	stack/erp5/buildout.cfg

component/firefox/buildout.cfg

@@ -26,12 +26,12 @@ depends =
   ${liberation-fonts:location}
   ${ipaex-fonts:location}
 
-version = 33.1
+version = 34.0.5
 
 # MD5SUMs are available at :
 # https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${:version}/MD5SUMS
-x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 1106b9c56da48a3e5c5ef965fea70078
-x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 4201d94f32b6b778456e5681cdcacd76
+x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 dfe5bc7643b3a5636e6775d236f071a5
+x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 1ffca0d8ef608123f2b9b30382043b6a
 
 script =
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')

component/groonga/buildout.cfg

@@ -11,8 +11,8 @@ extends =
 
 [groonga]
 recipe = slapos.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-4.0.7.tar.gz
-md5sum = 5d11546f921377d040f700bb74f1d7e4
+url = http://packages.groonga.org/source/groonga/groonga-4.0.8.tar.gz
+md5sum = 8c8d63bd5cf676acecca3698e2ae0601
 # temporary patch to respect more tokens in natural language mode.
 patches =
   ${:_profile_base_location_}/groonga.patch#9ed02fbe8400402d3eab47eee149978b

component/haproxy/buildout.cfg

@@ -11,8 +11,8 @@ parts = haproxy
 
 [haproxy]
 recipe = slapos.recipe.cmmi
-url = http://www.haproxy.org/download/1.5/src/haproxy-1.5.8.tar.gz
-md5sum = 7bffa1afa069d90ce03b7cd9aa0557cd
+url = http://www.haproxy.org/download/1.5/src/haproxy-1.5.9.tar.gz
+md5sum = b7672bb6a8aa188a655b418f3c96f65c
 configure-command = true
 # If the system is running on Linux 2.6, we use "linux26" as the TARGET,
 # otherwise use "generic".

component/mariadb/buildout.cfg

@@ -58,8 +58,8 @@ environment =
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
 # http://mroonga.github.com/
 recipe = slapos.recipe.cmmi
-url = http://packages.groonga.org/source/mroonga/mroonga-4.07.tar.gz
-md5sum = fcfca7934b1f8df981fca579d3cd41bd
+url = http://packages.groonga.org/source/mroonga/mroonga-4.08.tar.gz
+md5sum = 3c5da803a332f48fa1d21163c04954e4
 configure-command = mkdir fake_mariadb_source && ln -s ${mariadb:location}/include/mysql/private fake_mariadb_source/sql && ./configure
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}

slapos/recipe/neoppod.py

@@ -89,7 +89,12 @@ class Admin(NeoBaseRecipe):
 class Master(NeoBaseRecipe):
   def _getOptionList(self):
     options = self.options
-    return [
+    r = [
       '-p', options['partitions'],
       '-r', options['replicas'],
     ]
+    for x in (('-C', options['upstream-cluster']),
+              ('-M', options['upstream-masters'])):
+      if x[1]:
+        r += x
+    return r

slapos/recipe/wrapper.py

@@ -53,9 +53,7 @@ class Recipe(GenericBaseRecipe):
                           if filename.strip()]
         if environment is not None:
             environment = dict((k.strip(), v.strip()) for k, v in [
-                             line.split('=')
-                             for line in environment.split('\n')
-                           ])
+              line.split('=') for line in environment.splitlines() if line.strip() ])
         return [self.createPythonScript(
             wrapper_path,
             'slapos.recipe.librecipe.execute.generic_exec',

software/helloworld/instance.cfg.in

@@ -24,7 +24,7 @@ offline = true
 # It will then authenticate to SlapOS Master and fetch the instance parameters.
 # The parameters are accessible from $${instance-parameter:configuration.name-of-parameter}
 # Always the same. Just copy/paste.
-# See docstring of slapos.cookbook:slapconfiguration for more informations.
+# See docstring of slapos.cookbook:slapconfiguration for more information.
 recipe = slapos.cookbook:slapconfiguration
 computer = $${slap_connection:computer_id}
 partition = $${slap_connection:partition_id}
@@ -65,11 +65,10 @@ log = $${:var}/log
 # This recipe will try to "exec" the command-line after separating parameters.
 recipe = slapos.cookbook:wrapper
 # Notice that there is only one $ at ${dash:location}, it is because it comes from the Software Release buildout profile.
-command-line = ${dash:location}/bin/dash -c 'echo "Hello $${instance-parameter:configuration.name}, it is $(date)." > $${directory:log}/log.log; sleep 1000000;'
-# Put this shell script in the "etc/service" directory. Every executable of this
-# repository will be started and monitored by supervisord. If one service
-# exits/crashes, it will trigger a "bang" and cause run of slapgrid for the
-# instance.
+command-line = ${dash:location}/bin/dash -c 'echo "Hello $${instance-parameter:configuration.name}, it is $(date). If I were a TCP server, I would be listening on [$${instance-parameter:ipv6-random}] or $${instance-parameter:ipv4-random}" > $${directory:log}/log.log; sleep 1000000;'
+# Put this shell script in the "etc/service" directory. Each executable of this
+# repository will be started and monitored by supervisord. If a service
+# exits/crashes, it will trigger a "bang" and cause a re-run of the instance.
 wrapper-path = $${directory:service}/hello-world
 
 

software/helloworld/software.cfg

@@ -26,5 +26,5 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
 output = ${buildout:directory}/instance.cfg
 # MD5 checksum can be skipped for development (easier to develop), but must be filled for production
-md5sum = ed94ac99ae1e596c0da5350da6ab6f52
+md5sum = 532d13c3aee4f0252181da39765317f0
 mode = 0644

stack/erp5/buildout.cfg

@@ -670,7 +670,7 @@ huBarcode = 1.0.0
 interval = 1.0.0
 ipdb = 0.8
 ipython = 2.3.1
-logilab-common = 0.63.0
+logilab-common = 0.63.2
 minitage.paste = 1.4.6
 minitage.recipe.egg = 1.107
 numpy = 1.9.1
@@ -688,7 +688,7 @@ qrcode = 5.1
 restkit = 4.2.2
 rtjp-eventlet = 0.3.2
 slapos.recipe.template = 2.6
-slapos.toolbox = 0.45.1
+slapos.toolbox = 0.45.2
 smmap = 0.8.3
 socketpool = 0.5.3
 spyne = 2.11.0
@@ -702,7 +702,7 @@ xupdate-processor = 0.4
 xfw = 0.10
 
 # Required by:
-# slapos.toolbox==0.45.1
+# slapos.toolbox==0.45.2
 GitPython = 0.3.2.1
 
 # Required by:
@@ -710,7 +710,7 @@ GitPython = 0.3.2.1
 Products.ZSQLMethods = 2.13.4
 
 # Required by:
-# slapos.toolbox==0.45.1
+# slapos.toolbox==0.45.2
 atomize = 0.2.0
 
 # Required by:
@@ -718,7 +718,7 @@ atomize = 0.2.0
 erp5.util = 0.4.41
 
 # Required by:
-# slapos.toolbox==0.45.1
+# slapos.toolbox==0.45.2
 feedparser = 5.1.3
 
 # Required by:
@@ -747,7 +747,7 @@ minitage.recipe.common = 1.90
 ordereddict = 1.1
 
 # Required by:
-# slapos.toolbox==0.45.1
+# slapos.toolbox==0.45.2
 paramiko = 1.15.1
 
 # Required by:

stack/slapos.cfg

@@ -135,13 +135,13 @@ stevedore = 1.1.0
 Flask = 0.10.1
 
 # Required by:
-# cliff==1.8.0
+# cliff==1.9.0
 # stevedore==1.1.0
 argparse = 1.2.2
 
 # Required by:
 # slapos.core==1.3.5
-cliff = 1.8.0
+cliff = 1.9.0
 
 # Required by:
 # slapos.cookbook==0.87
@@ -160,7 +160,7 @@ netaddr = 0.7.12
 netifaces = 0.10.4
 
 # Required by:
-# cliff==1.8.0
+# cliff==1.9.0
 # stevedore==1.1.0
 pbr = 0.10.0
 
@@ -182,7 +182,7 @@ pytz = 2014.10
 
 # Required by:
 # slapos.core==1.3.5
-requests = 2.4.3
+requests = 2.5.0
 
 # Required by:
 # slapos.core==1.3.5