Commit 07f8694b authored by Kirill Smelkov's avatar Kirill Smelkov

software/ors-amarisoft: Activate for-RU DHCP server automatically

instead of requiring users to explicitly activate it via additional `dnsmasq` parameter.

The reason here is simple: CPRI-based radio units, for example Lopcomm ORAN RU,
need to be configured to go to radio, and for that configuration to work we
need to be able to talk via TCP/IP to the RU.

/cc @jhuge, @xavier_thompson, @Daetalus
/reviewed-by @lu.xu
/reviewed-on nexedi/slapos!1479
parent 17ea91a8
Pipeline #31352 passed with stage
in 0 seconds
...@@ -32,7 +32,7 @@ md5sum = ab666fdfadbfc7d8a16ace38d295c883 ...@@ -32,7 +32,7 @@ md5sum = ab666fdfadbfc7d8a16ace38d295c883
[ru_libinstance.jinja2.cfg] [ru_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/libinstance.jinja2.cfg _update_hash_filename_ = ru/libinstance.jinja2.cfg
md5sum = ef1ba8b7404088942c4ed3d7413e0291 md5sum = 548b5c7b82e6d47e050090d3e52fef1d
[ru_sdr_libinstance.jinja2.cfg] [ru_sdr_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
......
...@@ -180,14 +180,6 @@ ...@@ -180,14 +180,6 @@
"type": "number" "type": "number"
}, },
{%- endif %} {%- endif %}
{%- if trx == 'cpri' %}
"dnsmasq": {
"default": false,
"title": "dnsmasq",
"description": "dnsmasq",
"type": "boolean"
},
{%- endif %}
{%- if ru == 'lopcomm' %} {%- if ru == 'lopcomm' %}
"txa0cc00_active": { "txa0cc00_active": {
"title": "Lopcomm ORAN TX array carriers (TXA0CC00)", "title": "Lopcomm ORAN TX array carriers (TXA0CC00)",
......
...@@ -110,12 +110,6 @@ ...@@ -110,12 +110,6 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"dnsmasq": {
"default": false,
"title": "dnsmasq",
"description": "dnsmasq",
"type": "boolean"
},
"txa0cc00_active": { "txa0cc00_active": {
"title": "Lopcomm ORAN TX array carriers (TXA0CC00)", "title": "Lopcomm ORAN TX array carriers (TXA0CC00)",
"description": "Activate or inactivate Lopcomm ORAN TX array carriers (TXA0CC00)", "description": "Activate or inactivate Lopcomm ORAN TX array carriers (TXA0CC00)",
......
...@@ -120,12 +120,6 @@ ...@@ -120,12 +120,6 @@
"type": "object", "type": "object",
"default": {} "default": {}
}, },
"dnsmasq": {
"default": false,
"title": "dnsmasq",
"description": "dnsmasq",
"type": "boolean"
},
"enb_id": { "enb_id": {
"title": "eNB ID", "title": "eNB ID",
"description": "eNB ID", "description": "eNB ID",
......
...@@ -114,7 +114,7 @@ init = ...@@ -114,7 +114,7 @@ init =
{#- provide CPRI-based RUs IP address via DHCP #} {#- provide CPRI-based RUs IP address via DHCP #}
{%- if slapparameter_dict.get("dnsmasq", None) %} {%- if trx == 'cpri' %}
[dnsmasq-config] [dnsmasq-config]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
url = {{ru_dnsmasq_template}} url = {{ru_dnsmasq_template}}
......
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