Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Carlos Ramos Carreño
slapos
Commits
56d5d470
Commit
56d5d470
authored
8 months ago
by
Joanne Hugé
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wip
parent
497812ca
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+1
-1
software/ors-amarisoft/instance-core-network.jinja2.cfg
software/ors-amarisoft/instance-core-network.jinja2.cfg
+7
-3
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
56d5d470
...
...
@@ -100,7 +100,7 @@ md5sum = 601d6237059fa665d3f3ffb6a78ad9ca
[template-core-network]
_update_hash_filename_ = instance-core-network.jinja2.cfg
md5sum = 3
58e1b27fb2a45979a6166f10521ff2a
md5sum = 3
8bbabf1316ebd53bc40576defa58a6e
[template-ue]
_update_hash_filename_ = instance-ue.jinja2.cfg
...
...
This diff is collapsed.
Click to expand it.
software/ors-amarisoft/instance-core-network.jinja2.cfg
View file @
56d5d470
...
...
@@ -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)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment