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
Xavier Thompson
slapos
Commits
f651ebe0
Commit
f651ebe0
authored
Dec 03, 2024
by
Joanne Hugé
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
simpleran: publish MAC address
parent
b054bb72
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
6 deletions
+15
-6
software/simpleran/buildout.hash.cfg
software/simpleran/buildout.hash.cfg
+4
-4
software/simpleran/instance-core-network.jinja2.cfg
software/simpleran/instance-core-network.jinja2.cfg
+1
-0
software/simpleran/instance-enb.jinja2.cfg
software/simpleran/instance-enb.jinja2.cfg
+1
-0
software/simpleran/instance-ue.jinja2.cfg
software/simpleran/instance-ue.jinja2.cfg
+2
-0
software/simpleran/instance.cfg
software/simpleran/instance.cfg
+7
-2
No files found.
software/simpleran/buildout.hash.cfg
View file @
f651ebe0
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
[template]
[template]
filename = instance.cfg
filename = instance.cfg
md5sum =
6d1fed5e983ecf0f3f1f88ee32dddf75
md5sum =
75057fd3fc8b1722b13163f020b196c0
[template-ors]
[template-ors]
filename = instance-ors.cfg
filename = instance-ors.cfg
...
@@ -60,7 +60,7 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
...
@@ -60,7 +60,7 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
[template-enb]
[template-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg
_update_hash_filename_ = instance-enb.jinja2.cfg
md5sum =
248c284cb8612034695e3bcec279e3a2
md5sum =
915af421eb59f36f7145c404c88b24b0
[template-ors-enb]
[template-ors-enb]
_update_hash_filename_ = instance-ors-enb.jinja2.cfg
_update_hash_filename_ = instance-ors-enb.jinja2.cfg
...
@@ -72,11 +72,11 @@ md5sum = f4389a92fb111447e7976e452db78607
...
@@ -72,11 +72,11 @@ md5sum = f4389a92fb111447e7976e452db78607
[template-core-network]
[template-core-network]
_update_hash_filename_ = instance-core-network.jinja2.cfg
_update_hash_filename_ = instance-core-network.jinja2.cfg
md5sum =
7c809fb0a885fcaf7206d8b22aab9fba
md5sum =
d568767018b1389a8e0acbf0bc808ef5
[template-ue]
[template-ue]
_update_hash_filename_ = instance-ue.jinja2.cfg
_update_hash_filename_ = instance-ue.jinja2.cfg
md5sum =
cc06ec740fb26e86830f1fdb773c1d17
md5sum =
17b3324ed8554782456d30c888683f25
[template-obsolete]
[template-obsolete]
_update_hash_filename_ = instance-obsolete.jinja2.cfg
_update_hash_filename_ = instance-obsolete.jinja2.cfg
...
...
software/simpleran/instance-core-network.jinja2.cfg
View file @
f651ebe0
...
@@ -309,6 +309,7 @@ password = {{ slapparameter_dict['monitor-password'] | string }}
...
@@ -309,6 +309,7 @@ password = {{ slapparameter_dict['monitor-password'] | string }}
recipe = slapos.cookbook:publish.serialised
recipe = slapos.cookbook:publish.serialised
core-network-ipv6 = {{ my_ipv6 }}
core-network-ipv6 = {{ my_ipv6 }}
core-network-ipv4 = {{ lan_ipv4 }}
core-network-ipv4 = {{ lan_ipv4 }}
core-network-mac = {{ mac }}
amarisoft-version = {{ amarisoft['version']}}
amarisoft-version = {{ amarisoft['version']}}
amarisoft-host-id = {{ amarisoft['lteenb_host_id'] }}
amarisoft-host-id = {{ amarisoft['lteenb_host_id'] }}
amarisoft-available-versions = {{ amarisoft['version_installed'] }}
amarisoft-available-versions = {{ amarisoft['version_installed'] }}
...
...
software/simpleran/instance-enb.jinja2.cfg
View file @
f651ebe0
...
@@ -323,6 +323,7 @@ websocket-port = 443
...
@@ -323,6 +323,7 @@ websocket-port = 443
websocket-password = ${websocket-password:passwd}
websocket-password = ${websocket-password:passwd}
enb-ipv6 = {{ my_ipv6 }}
enb-ipv6 = {{ my_ipv6 }}
enb-ipv4 = {{ lan_ipv4 }}
enb-ipv4 = {{ lan_ipv4 }}
enb-mac = {{ mac }}
amarisoft-version = {{ amarisoft['version'] }}
amarisoft-version = {{ amarisoft['version'] }}
amarisoft-host-id = {{ amarisoft['lteenb_host_id'] }}
amarisoft-host-id = {{ amarisoft['lteenb_host_id'] }}
amarisoft-available-versions = {{ amarisoft['version_installed'] }}
amarisoft-available-versions = {{ amarisoft['version_installed'] }}
...
...
software/simpleran/instance-ue.jinja2.cfg
View file @
f651ebe0
...
@@ -139,6 +139,8 @@ iue_dict = {{ dumps(iue_dict) }}
...
@@ -139,6 +139,8 @@ iue_dict = {{ dumps(iue_dict) }}
<= monitor-publish
<= monitor-publish
recipe = slapos.cookbook:publish.serialised
recipe = slapos.cookbook:publish.serialised
rue_bind_addr = {{my_ipv6}}
rue_bind_addr = {{my_ipv6}}
ue-ipv4 = {{ lan_ipv4 }}
ue-mac = {{ mac }}
websocket-address = ${request-slave-frontend:connection-domain}/${nginx-params:websocket-path}
websocket-address = ${request-slave-frontend:connection-domain}/${nginx-params:websocket-path}
websocket-port = 443
websocket-port = 443
websocket-password = ${websocket-password:passwd}
websocket-password = ${websocket-password:passwd}
...
...
software/simpleran/instance.cfg
View file @
f651ebe0
...
@@ -39,7 +39,8 @@ context =
...
@@ -39,7 +39,8 @@ context =
raw pythonwitheggs ${buildout:bin-directory}/pythonwitheggs
raw pythonwitheggs ${buildout:bin-directory}/pythonwitheggs
section slap_connection slap-connection
section slap_connection slap-connection
key slapparameter_dict slap-configuration:configuration
key slapparameter_dict slap-configuration:configuration
key lan_ipv4 lan-ip:ipv4
key lan_ipv4 lan:ipv4
key mac lan:mac
key my_ipv4 slap-configuration:ipv4-random
key my_ipv4 slap-configuration:ipv4-random
key my_ipv6 slap-configuration:ipv6-random
key my_ipv6 slap-configuration:ipv6-random
raw nginx_template ${nginx_conf.in:target}
raw nginx_template ${nginx_conf.in:target}
...
@@ -146,7 +147,7 @@ init =
...
@@ -146,7 +147,7 @@ init =
except FileNotFoundError:
except FileNotFoundError:
pass
pass
[lan
-ip
]
[lan]
recipe = slapos.recipe.build
recipe = slapos.recipe.build
init =
init =
import netifaces
import netifaces
...
@@ -158,6 +159,10 @@ init =
...
@@ -158,6 +159,10 @@ init =
options['ipv4'] = a[netifaces.AF_INET][0]['addr']
options['ipv4'] = a[netifaces.AF_INET][0]['addr']
except:
except:
options['ipv4'] = "0.0.0.0"
options['ipv4'] = "0.0.0.0"
try:
options['mac'] = a[netifaces.AF_LINK][0]['addr']
except:
options['mac'] = "00:00:00:00:00:00"
[comp-id]
[comp-id]
recipe = slapos.recipe.build
recipe = slapos.recipe.build
...
...
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