Merge branch 'master' into 'master'

Use proper ERP5 cluster SR's URL and proper configuration.

Please merge

See merge request !1

playbook/roles/erp5-standalone/files/request-erp5-cluster

 import json
-software_url = 'http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/erp5-cluster:/software/erp5/software.cfg '
+software_url = 'http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/erp5-cluster:/software/erp5/software.cfg'
 # Choose a SlapOS Node
 # If you are deploying SlapOS Master with Webrunner, then computer_id is 'slaprunner'
 computer_id = 'local_computer'
@@ -9,39 +9,25 @@ parameter_dict = {
   "site-id": "erp5",
   "bt5": "erp5_full_text_myisam_catalog erp5_configurator_standard",
   "zope-partition-dict": {
+    "admin": {
+      "family": "admin",
+      "thread-amount": 4,
+      "port-base": 2220,
+      "instance-count": 1
+    },
     "activities-node": {
       "family": "activities",
       "thread-amount": 4,
       "instance-count": 1,
       "timerserver-interval": 1,
-      "computer-guid": computer_id,
+      "port-base": 2230
     },
-
     "distribution-node": {
       "family": "distribution",
       "thread-amount": 1,
       "instance-count": 1,
-      "computer-guid": computer_id,
       "port-base": 2210,
-      "timerserver-interval": 1,
-    },
-  },
-
-  "mariadb-computer-guid": computer_id,
-  "mariadb": {
-    "test-database-amount": 0
-  },
-
-  "zodb-software-type": "zeo",
-  "zodb-computer-guid": computer_id,
-  "zodb": {
-    "root": {
-      "cache-size": 1500,
-      "storage-dict": {
-        "client": {
-          "cache-size": "100MB"
-        }
-      }
+      "timerserver-interval": 1
     }
   }
 }
@@ -56,4 +42,4 @@ request(software_url,
   partition_parameter_kw={
    '_': json.dumps(parameter_dict, sort_keys=True, indent=2),
   }
-)
\ No newline at end of file
+)