Update Release Candidate

component/gnupg/buildout.cfg

+[buildout]
+extends =
+  ../bzip2/buildout.cfg
+  ../file/buildout.cfg
+  ../gnutls/buildout.cfg
+  ../sqlite3/buildout.cfg
+parts = gnupg
+
+[npth]
+<= gpg-common
+version = 1.5
+md5sum = 9ba2dc4302d2f32c66737c43ed191b1b
+configure-options-extra =
+  --disable-tests
+
+[libassuan]
+<= with-gpg-error
+version = 2.4.3
+md5sum = 8e01a7c72d3e5d154481230668e6eb5a
+
+[libksba]
+<= with-gpg-error
+version = 1.3.5
+md5sum = 8302a3e263a7c630aa7dea7d341f07a2
+
+[gnupg]
+<= libgcrypt
+version = 2.2.1
+md5sum = f781efae8756f6cf5d500aad8e4b33e2
+configure-options +=
+  --disable-ldap
+  --disable-card-support
+  --disable-photo-viewers
+  --with-bzip2=${bzip2:location}
+  --with-ksba-prefix=${libksba:location}
+  --with-libassuan-prefix=${libassuan:location}
+  --with-libgcrypt-prefix=${libgcrypt:location}
+  --with-npth-prefix=${npth:location}
+  --with-readline=${readline:location}
+environment =
+  PATH=${pkgconfig:location}/bin:${gettext:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${gnutls:pkg-config-path}:${gnutls:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig
+  CPPFLAGS=-I${file:location}/include -I${libgcrypt:location}/include
+  LDFLAGS=-L${file:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib -Wl,-rpath=${libgpg-error:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -Wl,-rpath=${libksba:location}/lib -Wl,-rpath=${libassuan:location}/lib -Wl,-rpath=${libgcrypt:location}/lib -Wl,-rpath=${npth:location}/lib

component/gnutls/buildout.cfg

@@ -14,7 +14,6 @@ url = http://www.gnupg.org/ftp/gcrypt/${:_buildout_section_name_}/${:_buildout_s
 configure-options = ${:configure-options-extra}
   --enable-option-checking=fatal
   --disable-dependency-tracking
-  --disable-doc
 environment = ${:environment-extra}
   PATH=${gettext:location}/bin:%(PATH)s
 environment-extra =
@@ -24,22 +23,30 @@ environment-extra =
 version = 1.27
 md5sum = 5217ef3e76a7275a2a3b569a12ddc989
 configure-options-extra =
+  --disable-doc
   --disable-tests
 
-[libgcrypt]
+[with-gpg-error]
 <= gpg-common
-version = 1.8.1
-md5sum = b21817f9d850064d2177285f1073ec55
-configure-options-extra =
+configure-options-extra = ${:configure-options-extra2}
   --with-gpg-error-prefix=${libgpg-error:location}
+configure-options-extra2 =
 environment-extra =
   LDFLAGS=-Wl,-rpath=${libgpg-error:location}/lib
 
+[libgcrypt]
+<= with-gpg-error
+version = 1.8.1
+md5sum = b21817f9d850064d2177285f1073ec55
+configure-options-extra2 =
+  --disable-doc
+
 [gnutls]
 <= gpg-common
 url = http://www.gnupg.org/ftp/gcrypt/gnutls/v3.5/gnutls-3.5.15.tar.xz
 md5sum = bcdcbc65c50a7499617ad9f4d0058de9
 configure-options-extra =
+  --disable-doc
   --disable-static
   --disable-libdane
   --disable-guile

component/golang/buildout.cfg

@@ -29,6 +29,7 @@ revision = go1.4.3-16-g4d5426a
 <= golang-common
 path = ${golang14-repository:location}
 environment-extra =
+make-targets= cd src && ./make.bash && cp -alf .. ${:location}
 
 
 [golang18]

component/openssl/buildout.cfg

@@ -16,8 +16,8 @@ parts =
 
 [openssl]
 recipe = slapos.recipe.cmmi
-url = https://www.openssl.org/source/openssl-1.0.2k.tar.gz
-md5sum = f965fc0bf01bf882b31314b61391ae65
+url = https://www.openssl.org/source/openssl-1.0.2m.tar.gz
+md5sum = 10e9e37f492094b9ef296f68f24a7666
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 # 'prefix' option to override --openssldir/--prefix (which is useful
 # when combined with INSTALL_PREFIX). Used by slapos.package.git/obs

setup.py

@@ -59,7 +59,7 @@ setup(name=name,
         'hexagonit.recipe.download',
         'netaddr', # to manipulate on IP addresses
         'setuptools', # namespaces
-        'inotifyx', # to watch filesystem changes (used in lockfile)
+        'inotifyx', # XXX use pyinotify instead
         'lock_file', #another lockfile implementation for multiprocess
         'slapos.core', # uses internally
         'zc.buildout', # plays with buildout
@@ -133,7 +133,6 @@ setup(name=name,
           'lamp.static = slapos.recipe.lamp:Static',
           'libcloud = slapos.recipe.libcloud:Recipe',
           'libcloudrequest = slapos.recipe.libcloudrequest:Recipe',
-          'lockfile = slapos.recipe.lockfile:Recipe',
           'logrotate = slapos.recipe.logrotate:Recipe',
           'logrotate.d = slapos.recipe.logrotate:Part',
           'memcached = slapos.recipe.memcached:Recipe',

slapos/recipe/generic_mysql/__init__.py

@@ -80,7 +80,7 @@ class Recipe(GenericBaseRecipe):
     mysql_script_list = []
 
     # user defined functions
-    udf_registration = ""
+    udf_registration = "DROP FUNCTION IF EXISTS last_insert_grn_id;\nDROP FUNCTION IF EXISTS mroonga_snippet;\nDROP FUNCTION IF EXISTS mroonga_command;\n"
     mroonga = self.options.get('mroonga', 'ha_mroonga.so')
     if mroonga:
       udf_registration += "CREATE FUNCTION last_insert_grn_id RETURNS " \

slapos/recipe/lockfile.py

-##############################################################################
-#
-# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-import os
-import sys
-import subprocess
-
-import inotifyx
-
-from slapos.recipe.librecipe import GenericBaseRecipe
-
-class LockFile(object):
-
-  class LockException(Exception):
-    pass
-
-  def __init__(self, filename, wait=True, exit=False):
-    self.filename = filename
-    if wait:
-      self.callback = lambda: self.waitDeletion()
-    elif not exit:
-      self.callback = lambda: self.raiseException()
-    else:
-      self.callback = lambda: sys.exit(1)
-
-  def raiseException(self):
-    raise LockFile.LockException("Not able to lock the file")
-
-  def waitDeletion(self):
-    inotify_fd = inotifyx.init()
-    try:
-      inotifyx.add_watch(inotify_fd, self.filename, inotifyx.IN_DELETE)
-      inotifyx.get_events(inotify_fd)
-    except IOError: # add_watch failed
-      pass
-    finally:
-      os.close(inotify_fd)
-
-    self.__enter__()
-
-  def __enter__(self):
-    try:
-      # Atomic file acquisition
-      self._fd = os.open(self.filename, os.O_CREAT | os.O_EXCL)
-    except OSError:
-      self.callback()
-
-  def __exit__(self, exc_type, exc_value, traceback):
-    os.close(self._fd)
-    os.unlink(self.filename)
-
-def locked_run(args):
-  with LockFile(args['filename'], wait=args['wait'], exit=True):
-    subprocess.check_call([args['binary']])
-
-class Recipe(GenericBaseRecipe):
-
-  def install(self):
-    wrapper = self.createPythonScript(self.options['wrapper'],
-                                      __name__ + '.locked_run',
-                                      dict(
-                                        filename=self.options['lock-file'],
-                                        wait=self.optionIsTrue('wait', False),
-                                        binary=self.options['binary'],
-                                      )
-                                     )
-    return [wrapper]

software/apache-frontend/buildout.hash.cfg

@@ -39,7 +39,7 @@ md5sum = 665e83d660c9b779249b2179d7ce4b4e
 
 [template-apache-frontend-configuration]
 filename = templates/apache.conf.in
-md5sum = 82cdb4ab02fec36285b9c1ce502f82f0
+md5sum = a56045e7b53ff00ab34d2a8f911fc1a1
 
 [template-custom-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in

software/apache-frontend/templates/apache.conf.in

@@ -166,8 +166,8 @@ SSLProxyCheckPeerCN off
 SSLProxyCheckPeerExpire off
 
 include {{frontend_configuration.get('log-access-configuration')}}
-include {{ slave_configuration_directory }}/*.conf
-include {{ slave_with_cache_configuration_directory }}/*.conf
+includeoptional {{ slave_configuration_directory }}/*.conf
+includeoptional {{ slave_with_cache_configuration_directory }}/*.conf
 
 ErrorDocument 404 /notfound.html
 RewriteRule (.*) /notfound.html [R=404,L]

software/buildout-testing/runTestSuite.in

+#!{{runTestSuite_py}}
+from __future__ import print_function
+import argparse, os, re, subprocess, sys
+from time import gmtime, strftime, time
+from erp5.util import taskdistribution
+from erp5.util.testsuite import SubprocessError, TestSuite
+from zc.buildout.buildout import Buildout
+
+slapos_buildout = {{repr(slapos_buildout)}}
+test_dict = {
+  'zc.buildout': slapos_buildout,
+  'zc.recipe.egg': os.path.join(slapos_buildout, 'zc.recipe.egg_'),
+}
+
+class DummyTestResult:
+
+  class DummyTestResultLine:
+    def stop(self, **kw):
+      pass
+
+  done = 0
+
+  def __init__(self, test_name_list):
+    self.test_name_list = test_name_list
+
+  def start(self):
+    test_result_line = self.DummyTestResultLine()
+    try:
+      test_result_line.name = self.test_name_list[self.done]
+    except IndexError:
+      return
+    self.done += 1
+    return test_result_line
+
+class BuildoutTestSuite(TestSuite):
+
+  RUN_RE = re.compile(
+    r'Ran (?P<all_tests>\d+) tests with'
+    ' (?P<failures>\d+) failures,'
+    ' (?P<errors>\d+) errors and'
+    ' (?P<skips>\d+) skipped in')
+
+  def run(self, test):
+    start = time()
+    try:
+      status_dict = self.spawn(os.path.join('bin', 'zope-testrunner'),
+        '--test-path', os.path.join(test_dict[test], 'src'))
+    except SubprocessError, e:
+      status_dict = e.status_dict
+    end = time()
+    status_dict.update(
+      date = strftime("%Y/%m/%d %H:%M:%S", gmtime(end)),
+      duration = end - start)
+    search = self.RUN_RE.search(status_dict['stdout'])
+    if search:
+      groupdict = search.groupdict()
+      status_dict.update(
+        test_count = int(groupdict['all_tests']),
+        error_count = int(groupdict['errors']),
+        failure_count = int(groupdict['failures']),
+        skip_count = int(groupdict['skips']))
+    return status_dict
+
+def main():
+  os.environ['TEMP'] = {{repr(temp_directory)}}
+  parser = argparse.ArgumentParser(description='Run a test suite.')
+  parser.add_argument('--test_suite', help='The test suite name')
+  parser.add_argument('--test_suite_title', help='The test suite title')
+  parser.add_argument('--test_node_title', help='The test node title')
+  parser.add_argument('--project_title', help='The project title')
+  parser.add_argument('--revision', help='The revision to test',
+                      default='dummy_revision')
+  parser.add_argument('--master_url',
+                      help='The Url of Master controling many suites')
+
+  args = parser.parse_args()
+
+  test_title = args.test_suite_title or args.test_suite
+  if args.master_url:
+    tool = taskdistribution.TaskDistributionTool(args.master_url)
+    test_result = tool.createTestResult(args.revision,
+                                        list(test_dict),
+                                        args.test_node_title,
+                                        test_title=test_title,
+                                        project_title=args.project_title)
+    if test_result is None:
+      return
+  else:
+    test_result = DummyTestResult(list(test_dict))
+
+  fd = os.open('buildout.cfg', os.O_CREAT | os.O_EXCL | os.O_WRONLY, 0666)
+  try:
+    os.write(fd, """\
+[buildout]
+extends = %s
+develop =%s
+parts = test
+
+[versions]
+%s
+
+[bootstrap]
+recipe = zc.recipe.egg
+eggs = zc.buildout
+
+[test]
+recipe = zc.recipe.egg
+eggs +=
+  zope.testrunner
+scripts =
+  zope-testrunner
+""" % (os.path.join(slapos_buildout, 'buildout.cfg'),
+       ''.join('\n  ' + x for x in test_dict.itervalues()),
+       '\n'.join(x + ' =' for x in test_dict)))
+  finally:
+    os.close(fd)
+  Buildout('buildout.cfg', {}).install(['bootstrap'])
+  subprocess.check_call((os.path.join('bin', 'buildout'),))
+
+  test_suite = BuildoutTestSuite(1)
+  while 1:
+    test_result_line = test_result.start()
+    if not test_result_line:
+      break
+    test_result_line.stop(**test_suite.run(test_result_line.name))
+
+if __name__ == "__main__":
+    main()

software/buildout-testing/software-next.cfg

+[buildout]
+extends = software.cfg
+
+[versions]
+setuptools = 36.6.0

software/buildout-testing/software.cfg

+[buildout]
+extends =
+  ../../stack/slapos.cfg
+parts =
+  slapos-cookbook
+  template
+
+[slapos.buildout-repository]
+recipe = slapos.recipe.build:gitclone
+repository = https://lab.nexedi.com/nexedi/slapos.buildout.git
+git-executable = ${git:location}/bin/git
+
+[runTestSuite_py]
+recipe = zc.recipe.egg
+eggs = erp5.util
+  zc.buildout
+scripts = ${:interpreter}
+interpreter = ${:_buildout_section_name_}
+
+[template]
+recipe = slapos.recipe.template:jinja2
+# XXX: "template.cfg" is hardcoded in instanciation recipe
+rendered = ${buildout:directory}/template.cfg
+template =
+  inline:
+  [buildout]
+  eggs-directory = ${buildout:eggs-directory}
+  develop-eggs-directory = ${buildout:develop-eggs-directory}
+  parts = runTestSuite
+
+  [slap-configuration]
+  recipe = slapos.cookbook:slapconfiguration.serialised
+  computer = $${slap-connection:computer-id}
+  partition = $${slap-connection:partition-id}
+  url = $${slap-connection:server-url}
+  key = $${slap-connection:key-file}
+  cert = $${slap-connection:cert-file}
+
+  [directory]
+  recipe = slapos.cookbook:mkdirectory
+  bin = $${buildout:directory}/bin
+  tmp = $${buildout:directory}/tmp
+
+  [slapos.buildout-repository]
+  recipe = slapos.recipe.build:gitclone
+  repository = ${slapos.buildout-repository:location}
+  git-executable = ${git:location}/bin/git
+  shared = true
+
+  [runTestSuite]
+  recipe = slapos.recipe.template:jinja2
+  rendered = $${directory:bin}/$${:_buildout_section_name_}
+  template = ${:_profile_base_location_}/$${:_buildout_section_name_}.in
+  mode = 0755
+  context =
+    key slapparameter_dict slap-configuration:configuration
+    key slapos_buildout slapos.buildout-repository:location
+    key temp_directory directory:tmp
+    raw runTestSuite_py ${buildout:bin-directory}/${runTestSuite_py:interpreter}

software/erp5/instance-erp5-input-schema.json

@@ -21,6 +21,10 @@
       "description": "Business Template to install at automatic site creation. By default, all configurators are installed.",
       "type": "string"
     },
+    "id-store-interval": {
+      "description": "Set Store Interval of default SQL Non Continuous Increasing Id Generator at automatic site creation. If unset, the value from the erp5_core Business Template is not touched.",
+      "type": "integer"
+    },
     "timezone": {
       "description": "Zope's timezone. Possible values are determined by host's libc, and typically come from a separate package (tzdata, ...)",
       "default": "UTC",

software/erp5testnode/software.cfg

@@ -27,10 +27,9 @@ eggs =
   zc.buildout
   slapos.libnetworkcache
   slapos.core
+  supervisor
   jsonschema
   hexagonit.recipe.download
-  netaddr
-  inotifyx
   lock_file
   pytz
   erp5.util

software/slapos-in-partition/common.cfg

@@ -71,21 +71,3 @@ mode = 0644
 recipe = zc.recipe.egg
 eggs =
   collective.recipe.template
-
-# Add slapos.libnetworkcache to path of slapos.core.
-[slapos-cookbook]
-eggs =
-  ${lxml-python:egg}
-  slapos.cookbook
-  cliff
-  hexagonit.recipe.download
-  inotifyx
-  netaddr
-  netifaces
-  requests
-  slapos.core
-  supervisor
-  xml_marshaller
-  pytz
-  slapos.libnetworkcache
-

software/slapos-master/buildout.hash.cfg

@@ -15,7 +15,7 @@
 # not need these here).
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = 95f7341ff490cb70df61fad35d08bc30
+md5sum = 251c1fcec1817fe70ec0cf7da69ccf3a
 
 [template-balancer]
 filename = instance-balancer.cfg.in

software/slapos-master/instance-erp5.cfg.in

@@ -155,6 +155,7 @@ config-deadlock-debugger-password = ${publish-early:deadlock-debugger-password}
 config-developer-list = {{ dumps(slapparameter_dict.get('developer-list', [inituser_login])) }}
 config-hosts-dict = {{ dumps(slapparameter_dict.get('hosts-dict', {})) }}
 config-hostalias-dict = {{ dumps(slapparameter_dict.get('hostalias-dict', {})) }}
+config-id-store-interval = {{ dumps(slapparameter_dict.get('id-store-interval')) }}
 config-inituser-login = {{ dumps(inituser_login) }}
 config-inituser-password = ${publish-early:inituser-password}
 config-kumofs-url = ${request-memcached-persistent:connection-url}

software/slaprunner/buildout.hash.cfg

@@ -19,11 +19,11 @@ md5sum = 713db528880282d568278f09458d2aab
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = baf70a9f2f433ea0f2f5139700e53b1f
+md5sum = 7df86928aeef0fbada832b0283b9a454
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2
-md5sum = 130193114cbbcd014af9704851410605
+md5sum = 1edd9c7a20e208b6cb647886bfb6d1bb
 
 [instance-runner-import]
 filename = instance-runner-import.cfg.in
@@ -55,7 +55,7 @@ md5sum = 525e37ea8b2acf6209869999b15071a6
 
 [template-slapos-cfg]
 filename = template/slapos.cfg.in
-md5sum = ef16446d432e1397182b1654fe920ffb
+md5sum = 035e027e9cb9bbdca0509ac895fc4696
 
 [template-parameters]
 filename = parameters.xml.in

software/slaprunner/instance-runner.cfg

@@ -137,6 +137,8 @@ working-directory = $${runnerdirectory:home}
 project-directory = $${runnerdirectory:project}
 instance_root = $${runnerdirectory:instance-root}
 software_root = $${runnerdirectory:software-root}
+pidfile-software = $${directory:run}/slapgrid-cp.pid
+pidfile-instance = $${directory:run}/slapgrid-sr.pid
 ssh_client = ${openssh:location}/bin/ssh
 public_key = $${runner-sshd-raw-server:rsa-keyfile}.pub
 private_key = $${runner-sshd-raw-server:rsa-keyfile}
@@ -728,14 +730,12 @@ ip = $${slaprunner:ipv4}
 server = $${:ip}:$${:port}
 port = 39986
 slapgrid-cp = slapgrid-cp
-slapgrid-cp-command = $${slaprunner:slapos} node instance --all --cfg $${:slapos-cfg} --pidfile $${:slapgrid-cp-pid} --verbose --logfile $${:slapgrid-cp-log}
+slapgrid-cp-command = $${slaprunner:slapos} node instance --all --cfg $${:slapos-cfg} --verbose --logfile $${:slapgrid-cp-log}
 slapgrid-cp-log = $${runnerdirectory:home}/instance.log
-slapgrid-cp-pid = $${directory:run}/slapgrid-cp.pid
 slapgrid-cp-startretries = 0
 slapgrid-sr = slapgrid-sr
-slapgrid-sr-command = $${slaprunner:slapos} node software --all --cfg $${:slapos-cfg} --pidfile $${:slapgrid-sr-pid} --verbose --logfile $${:slapgrid-sr-log}
+slapgrid-sr-command = $${slaprunner:slapos} node software --all --cfg $${:slapos-cfg} --verbose --logfile $${:slapgrid-sr-log}
 slapgrid-sr-log = $${runnerdirectory:home}/software.log
-slapgrid-sr-pid = $${directory:run}/slapgrid-sr.pid
 slapgrid-sr-startretries = 0
 slapproxy = slapproxy
 slapproxy-autorestart = true

software/slaprunner/template/runner-import.sh.jinja2

@@ -155,22 +155,20 @@ rm '{{ instance_folder }}'/etc/supervisord.conf.d/* || true
 
 SLAPOSCFG='{{ supervisord["slapos-cfg"] }}'
 SLAPGRIDSRLOG='{{ supervisord["slapgrid-sr-log"] }}'
-SLAPGRIDSRPID='{{ supervisord["slapgrid-sr-pid"] }}'
 SLAPGRIDCPLOG='{{ supervisord["slapgrid-cp-log"] }}'
-SLAPGRIDCPPID='{{ supervisord["slapgrid-cp-pid"] }}'
 
 log_message "Building newest Software Release..."
-"$SLAPOS" node software --cfg "$SLAPOSCFG" --all --master-url="$MASTERURL" --logfile "$SLAPGRIDSRLOG" --pidfile "$SLAPGRIDSRPID" >/dev/null 2>&1 ||
-"$SLAPOS" node software --cfg "$SLAPOSCFG" --all --master-url="$MASTERURL" --logfile "$SLAPGRIDSRLOG" --pidfile "$SLAPGRIDSRPID" >/dev/null 2>&1 ||
-"$SLAPOS" node software --cfg "$SLAPOSCFG" --all --master-url="$MASTERURL" --logfile "$SLAPGRIDSRLOG" --pidfile "$SLAPGRIDSRPID" >/dev/null 2>&1 ||
+"$SLAPOS" node software --cfg "$SLAPOSCFG" --all --master-url="$MASTERURL" --logfile "$SLAPGRIDSRLOG" >/dev/null 2>&1 ||
+"$SLAPOS" node software --cfg "$SLAPOSCFG" --all --master-url="$MASTERURL" --logfile "$SLAPGRIDSRLOG" >/dev/null 2>&1 ||
+"$SLAPOS" node software --cfg "$SLAPOSCFG" --all --master-url="$MASTERURL" --logfile "$SLAPGRIDSRLOG" >/dev/null 2>&1 ||
 (tail -n 200 "$SLAPGRIDSRLOG" && false)
 # Remove defined scripts to force buildout to recreate them to have updated paths
 rm "$srv_directory"/runner/instance/slappart*/srv/runner-import-restore || true
 log_message "Fixing Instances as needed after import..."
 # XXX hardcoded
-"$SLAPOS" node instance --cfg "$SLAPOSCFG" --master-url=$MASTERURL --logfile "$SLAPGRIDCPLOG" --pidfile "$SLAPGRIDCPPID" >/dev/null 2>&1 ||
-"$SLAPOS" node instance --cfg "$SLAPOSCFG" --master-url=$MASTERURL --logfile "$SLAPGRIDCPLOG" --pidfile "$SLAPGRIDCPPID" >/dev/null 2>&1 ||
-"$SLAPOS" node instance --cfg "$SLAPOSCFG" --master-url=$MASTERURL --logfile "$SLAPGRIDCPLOG" --pidfile "$SLAPGRIDCPPID" >/dev/null 2>&1 ||
+"$SLAPOS" node instance --cfg "$SLAPOSCFG" --master-url=$MASTERURL --logfile "$SLAPGRIDCPLOG" >/dev/null 2>&1 ||
+"$SLAPOS" node instance --cfg "$SLAPOSCFG" --master-url=$MASTERURL --logfile "$SLAPGRIDCPLOG" >/dev/null 2>&1 ||
+"$SLAPOS" node instance --cfg "$SLAPOSCFG" --master-url=$MASTERURL --logfile "$SLAPGRIDCPLOG" >/dev/null 2>&1 ||
 (tail -n 200 "$SLAPGRIDCPLOG" && false)
 
 # Invoke defined scripts for each partition inside of slaprunner