playbook: set release candidates for erp5 and wendelin.

playbook/erp5-standalone.yml

@@ -2,6 +2,9 @@
   hosts: 127.0.0.1
   connection: local
 
+  vars:
+    software_release_url: https://lab.nexedi.cn/nexedi/slapos/raw/erp5-cluster-0.1/software/erp5/software.cfg
+
   roles:
     - erp5-standalone
 

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 = 'https://lab.nexedi.cn/nexedi/slapos/raw/erp5-cluster-0.1/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'

playbook/roles/erp5-standalone/tasks/main.yml

@@ -4,7 +4,7 @@
     ignore_errors: True
 
   - name: Supply erp5 software release
-    shell: slapos supply http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/erp5-cluster:/software/erp5/software.cfg local_computer
+    shell: slapos supply {{ software_release_url }} local_computer
 
   - name: create partition script
     copy: src=request-erp5-cluster dest=/tmp/playbook-request-erp5-cluster mode=700

playbook/roles/wendelin-standalone/files/request-wendelin

 import json
 # copied from the request-erp5-cluster script, only changed the url to point to wendelin
-software_url = 'https://lab.nexedi.cn/nexedi/slapos/raw/master/software/wendelin/software.cfg'
+software_url = 'https://lab.nexedi.cn/nexedi/slapos/raw/1.0/software/wendelin/software.cfg'
 # Choose a SlapOS Node
 # If you are deploying SlapOS Master with Webrunner, then computer_id is 'slaprunner'
 computer_id = 'local_computer'
 
 parameter_dict = {
-  "timezone": "UTC",
-  "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,
-      "port-base": 2230
-    },
-    "distribution-node": {
-      "family": "distribution",
-      "thread-amount": 1,
-      "instance-count": 1,
-      "port-base": 2210,
-      "timerserver-interval": 1
-    }
-  }
 }
 
 # Choose a title
@@ -40,7 +15,5 @@ request(software_url,
   title,
   filter_kw={'computer_guid': computer_id},
   software_type='default',
-  partition_parameter_kw={
-   '_': json.dumps(parameter_dict, sort_keys=True, indent=2),
-  }
+  partition_parameter_kw={}
 )

playbook/roles/wendelin-standalone/tasks/main.yml

@@ -4,7 +4,7 @@
     ignore_errors: True
 
   - name: Supply wendelin software release
-    shell: slapos supply https://lab.nexedi.cn/nexedi/slapos/raw/master/software/wendelin/software.cfg local_computer
+    shell: slapos supply {{ software_release_url }} local_computer
 
   - name: create partition script
     copy: src=request-wendelin dest=/tmp/playbook-request-wendelin mode=700

playbook/wendelin-standalone.yml

@@ -2,6 +2,9 @@
   hosts: 127.0.0.1
   connection: local
 
+  vars:
+    software_release_url: https://lab.nexedi.cn/nexedi/slapos/raw/1.0/software/wendelin/software.cfg
+
   roles:
     - wendelin-standalone
     - standalone-shared