Merge branch 'master' into 'master'

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

See merge request !1

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

 ---
-  - name: Add ipv6 to lo interface
-    shell: ip -6 addr add 2001::1/64 dev lo
-    ignore_errors: True
-
   - name: Supply erp5 software release
     shell: slapos supply {{ software_release_url }} local_computer
 

playbook/roles/slapos-proxy/tasks/main.yml

@@ -18,6 +18,10 @@
   - name: Wait for proxy
     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
     shell: "slapos node format --now --alter_user=True"
     when: slapos_cfg.stat.exists == False

playbook/roles/standalone-shared/files/erp5-show

@@ -84,9 +84,11 @@ def status(software_release):
              "  username: zope  password: " + pw)
   elif not build:
     print "Your software is still building, be patient it can take awhile"
+    sys.exit(2)
   elif build == "error":
     print "An error occurred while building, check /opt/slapos/log/slapos-node-software-" + \
           fmt_date() + ".log for details"
+    sys.exit(2)
 
   # check if the services are actually running (run slapos node and parse output)
   if pw is None:
@@ -96,9 +98,9 @@ def status(software_release):
     print "At least one of your services isn't running! Check with slapos node"
     print "restart a service with slapos node restart slappart:service"
 
-def info():
+def info(software_release):
   if get_build_status():
-    print get_connection_information()
+    print get_connection_information(software_release)
   else:
     print "Information unavailable at this time, run " + sys.argv[0] + " -s for details"
 

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

 ---
-  - name: Add ipv6 to lo interface
-    shell: ip -6 addr add 2001::1/64 dev lo
-    ignore_errors: True
-
   - name: Supply wendelin software release
     shell: slapos supply {{ software_release_url }} local_computer