Commit 6d5d201c authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent ed9b2c33
...@@ -195,7 +195,7 @@ logfile = ${xamari-xlog-script:logfile} ...@@ -195,7 +195,7 @@ logfile = ${xamari-xlog-script:logfile}
forward-host = {{ slapparameter_dict.get('xlog_fluentbit_forward_host', '') }} forward-host = {{ slapparameter_dict.get('xlog_fluentbit_forward_host', '') }}
forward-port = {{ slapparameter_dict.get('xlog_fluentbit_forward_port', '') }} forward-port = {{ slapparameter_dict.get('xlog_fluentbit_forward_port', '') }}
forward-shared-key = {{ slapparameter_dict.get('xlog_fluentbit_forward_shared_key', '') }} forward-shared-key = {{ slapparameter_dict.get('xlog_fluentbit_forward_shared_key', '') }}
forward-self-hostname = {{ ors_id['ors-id'] }} forward-self-hostname = {{ comp_id['comp-id'] }}
inline = inline =
[SERVICE] [SERVICE]
flush 5 flush 5
......
...@@ -229,15 +229,15 @@ init = ...@@ -229,15 +229,15 @@ init =
except: except:
options['ipv4'] = "0.0.0.0" options['ipv4'] = "0.0.0.0"
[ors-id] [comp-id]
recipe = slapos.recipe.build recipe = slapos.recipe.build
computer = $${slap-connection:computer-id} computer = $${slap-connection:computer-id}
title = $${slap-configuration:root-instance-title} title = $${slap-configuration:root-instance-title}
init = init =
import socket import socket
options['hostname'] = socket.gethostname() options['hostname'] = socket.gethostname()
ors_id = '__'.join(options[x] for x in ('hostname', 'computer', 'title')) comp_id = '__'.join(options[x] for x in ('hostname', 'computer', 'title'))
options['ors-id'] = ors_id options['comp-id'] = comp_id
[switch-softwaretype] [switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype recipe = slapos.cookbook:switch-softwaretype
...@@ -269,7 +269,7 @@ extensions = jinja2.ext.do ...@@ -269,7 +269,7 @@ extensions = jinja2.ext.do
extra-context = extra-context =
raw monitor_template ${monitor2-template:output} raw monitor_template ${monitor2-template:output}
section ors_version ors-version section ors_version ors-version
section ors_id ors-id section comp_id comp-id
section slap_configuration slap-configuration section slap_configuration slap-configuration
key enb amarisoft:enb key enb amarisoft:enb
key sdr amarisoft:sdr key sdr amarisoft:sdr
...@@ -307,7 +307,7 @@ extensions = jinja2.ext.do ...@@ -307,7 +307,7 @@ extensions = jinja2.ext.do
extra-context = extra-context =
raw monitor_template ${monitor2-template:output} raw monitor_template ${monitor2-template:output}
section ors_version ors-version section ors_version ors-version
section ors_id ors-id section comp_id comp-id
key enb amarisoft:enb key enb amarisoft:enb
key sdr amarisoft:sdr key sdr amarisoft:sdr
raw gnb_template ${gnb.jinja2.cfg:target} raw gnb_template ${gnb.jinja2.cfg:target}
......
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