wip

software/ors-amarisoft/buildout.hash.cfg

@@ -100,7 +100,7 @@ md5sum = 601d6237059fa665d3f3ffb6a78ad9ca
 
 [template-core-network]
 _update_hash_filename_ = instance-core-network.jinja2.cfg
-md5sum = 358e1b27fb2a45979a6166f10521ff2a
+md5sum = 38bbabf1316ebd53bc40576defa58a6e
 
 [template-ue]
 _update_hash_filename_ = instance-ue.jinja2.cfg

software/ors-amarisoft/instance-core-network.jinja2.cfg

@@ -111,10 +111,14 @@ sim_list = {{ dumps(sim_slave_instance_list) }}
 {%- endif %}
 
 {#-   split slapos tun interface #}
+{%- set tun = slap_configuration.get('tun-name', '')   %}
+{%- if tun == '' %}
+{%-   set tun = 'xxx-notun-xxx'   %}
+{%- endif %}
 {%-   set vtun_list = []  %}
 [vtun]
 recipe = plone.recipe.command
-command = {{ netcapdo }} {{ pythonwitheggs }} {{ tunsplit }} {{ slaplte.tun }} 2
+command = {{ netcapdo }} {{ pythonwitheggs }} {{ tunsplit }} {{ tun }} 2
 update-command = ${:command}
 stop-on-error = true
 {%-   if testing  %}
@@ -122,7 +126,7 @@ command = :
 {%-   endif %}
 
 {%-   for i in range(1,3)  %}
-{%-     set tun = '%s-%d' % (slaplte.tun, i)   %}
+{%-     set tun = '%s-%d' % (tun, i)   %}
 {%-     do vtun_list.append(tun) %}
 [vtun.{{ tun }}]
 recipe = slapos.recipe.build
@@ -144,7 +148,7 @@ init =
   if {{ testing }}:
     slapnet = netaddr.IPNetwork('{{ str(test_slapnet) }}')
   else:
-    slapnet = tunsplit.ifnet6('{{ slaplte.tun }}')
+    slapnet = tunsplit.ifnet6('{{ tun }}')
   tunnet  = tunsplit.netsplit(slapnet, {{ 1+ntun }}) [{{ i }}]
 
   options['network'] = str(tunnet)