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
Léo-Paul Géneau
slapos
Commits
8d2f0397
Commit
8d2f0397
authored
Jun 06, 2024
by
Joanne Hugé
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ors-amarisoft: remove config_link parameters
parent
80508e58
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
38 deletions
+4
-38
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+4
-4
software/ors-amarisoft/instance-core-network.jinja2.cfg
software/ors-amarisoft/instance-core-network.jinja2.cfg
+0
-4
software/ors-amarisoft/instance-enb.jinja2.cfg
software/ors-amarisoft/instance-enb.jinja2.cfg
+0
-12
software/ors-amarisoft/instance-ors-enb.jinja2.cfg
software/ors-amarisoft/instance-ors-enb.jinja2.cfg
+0
-6
software/ors-amarisoft/instance-ue.jinja2.cfg
software/ors-amarisoft/instance-ue.jinja2.cfg
+0
-12
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
8d2f0397
...
@@ -60,19 +60,19 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
...
@@ -60,19 +60,19 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
[template-enb]
[template-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg
_update_hash_filename_ = instance-enb.jinja2.cfg
md5sum =
2294f837e8dc6666d7aabfa186ebd175
md5sum =
19a532834b71182483c821cbd725ea17
[template-ors-enb]
[template-ors-enb]
_update_hash_filename_ = instance-ors-enb.jinja2.cfg
_update_hash_filename_ = instance-ors-enb.jinja2.cfg
md5sum =
601d6237059fa665d3f3ffb6a78ad9c
a
md5sum =
315633c8d09b84ef1c699094810c654
a
[template-core-network]
[template-core-network]
_update_hash_filename_ = instance-core-network.jinja2.cfg
_update_hash_filename_ = instance-core-network.jinja2.cfg
md5sum =
c987ad01bd4c940e1180db5abb6dd000
md5sum =
dab992c02a363e00cdc86f102a7ae489
[template-ue]
[template-ue]
_update_hash_filename_ = instance-ue.jinja2.cfg
_update_hash_filename_ = instance-ue.jinja2.cfg
md5sum =
812a43458c21f7d0cdb2141515a236ae
md5sum =
574e525659bd73c5385c78469adadf91
[template-obsolete]
[template-obsolete]
_update_hash_filename_ = instance-obsolete.jinja2.cfg
_update_hash_filename_ = instance-obsolete.jinja2.cfg
...
...
software/ors-amarisoft/instance-core-network.jinja2.cfg
View file @
8d2f0397
...
@@ -267,11 +267,7 @@ context =
...
@@ -267,11 +267,7 @@ context =
[mme-config]
[mme-config]
<= config-base
<= config-base
{% if slapparameter_dict.get("mme_config_link", None) %}
url = ${mme-config-dl:target}
{% else %}
url = {{ mme_template }}
url = {{ mme_template }}
{% endif %}
output = ${directory:etc}/mme.cfg
output = ${directory:etc}/mme.cfg
extra-context =
extra-context =
raw support_ims {{ support_ims }}
raw support_ims {{ support_ims }}
...
...
software/ors-amarisoft/instance-enb.jinja2.cfg
View file @
8d2f0397
...
@@ -85,14 +85,6 @@ promise = ${:etc}/promise
...
@@ -85,14 +85,6 @@ promise = ${:etc}/promise
log = ${:var}/log
log = ${:var}/log
xlog-fluentbit = ${:var}/xlog-fluentbit
xlog-fluentbit = ${:var}/xlog-fluentbit
{% if slapparameter_dict.get("enb_config_link", None) %}
[enb-config-dl]
recipe = slapos.recipe.build:download
url = {{ slapparameter_dict.get("enb_config_link") }}
version = {{ slapparameter_dict.get("enb_config_version") }}
offline = false
{% endif %}
[enb-sh-wrapper]
[enb-sh-wrapper]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
output = ${directory:bin}/${:_buildout_section_name_}
output = ${directory:bin}/${:_buildout_section_name_}
...
@@ -235,11 +227,7 @@ context =
...
@@ -235,11 +227,7 @@ context =
[enb-config]
[enb-config]
<= config-base
<= config-base
{% if slapparameter_dict.get("enb_config_link", None) %}
url = ${enb-config-dl:target}
{% else %}
url = {{ enb_template }}
url = {{ enb_template }}
{% endif %}
output = ${directory:etc}/enb.cfg
output = ${directory:etc}/enb.cfg
import-list =
import-list =
rawfile slaplte.jinja2 {{ slaplte_template }}
rawfile slaplte.jinja2 {{ slaplte_template }}
...
...
software/ors-amarisoft/instance-ors-enb.jinja2.cfg
View file @
8d2f0397
...
@@ -199,12 +199,6 @@
...
@@ -199,12 +199,6 @@
are present, replace their generic enb_* counterparts with gnb_* ones #}
are present, replace their generic enb_* counterparts with gnb_* ones #}
{%- if enb_mode == 'gnb' %}
{%- if enb_mode == 'gnb' %}
{%- set _ = slapparameter_dict %}
{%- set _ = slapparameter_dict %}
{%- if 'gnb_config_link' in _ %}
{%- do _.update({
'enb_config_link': _.gnb_config_link,
'enb_config_version': _.get('gnb_config_version'),
}) %}
{%- endif %}
{%- if 'gnb_stats_fetch_period' in _ %}
{%- if 'gnb_stats_fetch_period' in _ %}
{%- do _.update({'enb_stats_fetch_period': _.gnb_stats_fetch_period}) %}
{%- do _.update({'enb_stats_fetch_period': _.gnb_stats_fetch_period}) %}
{%- endif %}
{%- endif %}
...
...
software/ors-amarisoft/instance-ue.jinja2.cfg
View file @
8d2f0397
...
@@ -58,14 +58,6 @@ service = ${:etc}/service
...
@@ -58,14 +58,6 @@ service = ${:etc}/service
promise = ${:etc}/promise
promise = ${:etc}/promise
log = ${:var}/log
log = ${:var}/log
{% if slapparameter_dict.get("ue_config_link", None) %}
[ue-config-dl]
recipe = slapos.recipe.build:download
url = {{ slapparameter_dict.get("ue_config_link") }}
version = {{ slapparameter_dict.get("ue_config_version") }}
offline = false
{% endif %}
[lte-ue-sh-wrapper]
[lte-ue-sh-wrapper]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
output = ${directory:bin}/${:_buildout_section_name_}
output = ${directory:bin}/${:_buildout_section_name_}
...
@@ -110,11 +102,7 @@ context =
...
@@ -110,11 +102,7 @@ context =
[lte-ue-config]
[lte-ue-config]
<= config-base
<= config-base
{% if slapparameter_dict.get("ue_config_link", None) %}
url = ${ue-config-dl:target}
{% else %}
url = {{ ue_template }}
url = {{ ue_template }}
{% endif %}
output = ${directory:etc}/ue.cfg
output = ${directory:etc}/ue.cfg
import-list =
import-list =
rawfile slaplte.jinja2 {{ slaplte_template }}
rawfile slaplte.jinja2 {{ slaplte_template }}
...
...
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