Commit 0dd0b79f authored by Joanne Hugé's avatar Joanne Hugé

wip

parent 56d5d470
...@@ -100,7 +100,7 @@ md5sum = 601d6237059fa665d3f3ffb6a78ad9ca ...@@ -100,7 +100,7 @@ md5sum = 601d6237059fa665d3f3ffb6a78ad9ca
[template-core-network] [template-core-network]
_update_hash_filename_ = instance-core-network.jinja2.cfg _update_hash_filename_ = instance-core-network.jinja2.cfg
md5sum = 38bbabf1316ebd53bc40576defa58a6e md5sum = 78adcae68456e957520c019ec8add80a
[template-ue] [template-ue]
_update_hash_filename_ = instance-ue.jinja2.cfg _update_hash_filename_ = instance-ue.jinja2.cfg
......
...@@ -121,9 +121,9 @@ recipe = plone.recipe.command ...@@ -121,9 +121,9 @@ recipe = plone.recipe.command
command = {{ netcapdo }} {{ pythonwitheggs }} {{ tunsplit }} {{ tun }} 2 command = {{ netcapdo }} {{ pythonwitheggs }} {{ tunsplit }} {{ tun }} 2
update-command = ${:command} update-command = ${:command}
stop-on-error = true stop-on-error = true
{%- if testing %} #{%- if testing %}
command = : #command = :
{%- endif %} #{%- endif %}
{%- for i in range(1,3) %} {%- for i in range(1,3) %}
{%- set tun = '%s-%d' % (tun, i) %} {%- set tun = '%s-%d' % (tun, i) %}
...@@ -145,10 +145,11 @@ init = ...@@ -145,10 +145,11 @@ init =
# simulate what tunsplit would assign to the tun # simulate what tunsplit would assign to the tun
# ( tun subinterface will be created for real later at install time - when it # ( tun subinterface will be created for real later at install time - when it
# is too late to update section options ) # is too late to update section options )
if {{ testing }}: # if {{ testing }}:
slapnet = netaddr.IPNetwork('{{ str(test_slapnet) }}') # slapnet = netaddr.IPNetwork('{{ str(test_slapnet) }}')
else: # else:
slapnet = tunsplit.ifnet6('{{ tun }}') # slapnet = tunsplit.ifnet6('{{ tun }}')
slapnet = tunsplit.ifnet6('{{ tun }}')
tunnet = tunsplit.netsplit(slapnet, {{ 1+ntun }}) [{{ i }}] tunnet = tunsplit.netsplit(slapnet, {{ 1+ntun }}) [{{ i }}]
options['network'] = str(tunnet) options['network'] = str(tunnet)
......
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