Commit 8dcd8f3d authored by root's avatar root

Moves IPv6 setup into slapos-proxy (where it is needed), and fixes bugs in erp5-show

The ipv6 address was not set up before 'slapos format' needed it, so it always failed
parent 281623a7
--- ---
- 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 {{ software_release_url }} local_computer shell: slapos supply {{ software_release_url }} local_computer
......
...@@ -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"
......
--- ---
- 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 {{ software_release_url }} local_computer shell: slapos supply {{ software_release_url }} local_computer
......
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