Commit 86676e8f authored by Rafael Monnerat's avatar Rafael Monnerat

Merge branch 'master' into 'master'

Set release wendelin candidate

See merge request !4
parents 52cb3356 0cdbf622
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
hosts: 127.0.0.1 hosts: 127.0.0.1
connection: local connection: local
vars:
software_release_url: https://lab.nexedi.cn/nexedi/slapos/raw/erp5-cluster-0.1/software/erp5/software.cfg
roles: roles:
- erp5-standalone - erp5-standalone
import json 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 # Choose a SlapOS Node
# If you are deploying SlapOS Master with Webrunner, then computer_id is 'slaprunner' # If you are deploying SlapOS Master with Webrunner, then computer_id is 'slaprunner'
computer_id = 'local_computer' computer_id = 'local_computer'
......
--- ---
- name: Add ipv6 to lo interface
shell: ip -6 addr add 2001::1/64 dev lo
ignore_errors: True
- name: Supply erp5 software release - 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 - name: create partition script
copy: src=request-erp5-cluster dest=/tmp/playbook-request-erp5-cluster mode=700 copy: src=request-erp5-cluster dest=/tmp/playbook-request-erp5-cluster mode=700
......
...@@ -18,6 +18,10 @@ ...@@ -18,6 +18,10 @@
- name: Wait for proxy - name: Wait for proxy
wait_for: host=127.0.0.1 port=8080 delay=10 wait_for: host=127.0.0.1 port=8080 delay=10
- name: Add ipv6 to lo interface
shell: ip -6 addr add 2001::1/64 dev lo
ignore_errors: True
- name: Run slapos format for initial bootstrap - name: Run slapos format for initial bootstrap
shell: "slapos node format --now --alter_user=True" shell: "slapos node format --now --alter_user=True"
when: slapos_cfg.stat.exists == False when: slapos_cfg.stat.exists == False
......
...@@ -84,9 +84,11 @@ def status(software_release): ...@@ -84,9 +84,11 @@ def status(software_release):
" username: zope password: " + pw) " username: zope password: " + pw)
elif not build: elif not build:
print "Your software is still building, be patient it can take awhile" print "Your software is still building, be patient it can take awhile"
sys.exit(2)
elif build == "error": elif build == "error":
print "An error occurred while building, check /opt/slapos/log/slapos-node-software-" + \ print "An error occurred while building, check /opt/slapos/log/slapos-node-software-" + \
fmt_date() + ".log for details" fmt_date() + ".log for details"
sys.exit(2)
# check if the services are actually running (run slapos node and parse output) # check if the services are actually running (run slapos node and parse output)
if pw is None: if pw is None:
...@@ -96,9 +98,9 @@ def status(software_release): ...@@ -96,9 +98,9 @@ def status(software_release):
print "At least one of your services isn't running! Check with slapos node" print "At least one of your services isn't running! Check with slapos node"
print "restart a service with slapos node restart slappart:service" print "restart a service with slapos node restart slappart:service"
def info(): def info(software_release):
if get_build_status(): if get_build_status():
print get_connection_information() print get_connection_information(software_release)
else: else:
print "Information unavailable at this time, run " + sys.argv[0] + " -s for details" print "Information unavailable at this time, run " + sys.argv[0] + " -s for details"
......
import json import json
# copied from the request-erp5-cluster script, only changed the url to point to wendelin # 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 # Choose a SlapOS Node
# If you are deploying SlapOS Master with Webrunner, then computer_id is 'slaprunner' # If you are deploying SlapOS Master with Webrunner, then computer_id is 'slaprunner'
computer_id = 'local_computer' computer_id = 'local_computer'
parameter_dict = { 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 # Choose a title
...@@ -40,7 +15,5 @@ request(software_url, ...@@ -40,7 +15,5 @@ request(software_url,
title, title,
filter_kw={'computer_guid': computer_id}, filter_kw={'computer_guid': computer_id},
software_type='default', software_type='default',
partition_parameter_kw={ partition_parameter_kw={}
'_': json.dumps(parameter_dict, sort_keys=True, indent=2),
}
) )
--- ---
- name: Add ipv6 to lo interface
shell: ip -6 addr add 2001::1/64 dev lo
ignore_errors: True
- name: Supply wendelin software release - 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 - name: create partition script
copy: src=request-wendelin dest=/tmp/playbook-request-wendelin mode=700 copy: src=request-wendelin dest=/tmp/playbook-request-wendelin mode=700
......
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
hosts: 127.0.0.1 hosts: 127.0.0.1
connection: local connection: local
vars:
software_release_url: https://lab.nexedi.cn/nexedi/slapos/raw/1.0/software/wendelin/software.cfg
roles: roles:
- wendelin-standalone - wendelin-standalone
- standalone-shared - standalone-shared
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment