Commit a6a4d2d4 authored by Kirill Smelkov's avatar Kirill Smelkov

software/ors-amarisoft: Rename ors-id -> comp-id

We use computer identifier in fluentd forwarding. This identifier was named as
ors-id, but it applies not only to ORS, but also to generic deployment with
BBU.

In the next patch we are going to introduce ORS mode and move ORS-specific
bits to software-ors.cfg and instance-ors.cfg + co. The computer identifier
will stay in generic part, because it is generic.

-> To avoid ambiguity rename it to be clearly unrelated to ORS specifics.

/cc @jhuge, @lu.xu, @tomo, @xavier_thompson, @Daetalus
/proposed-for-review-on nexedi/slapos!1522
/reviewed-by TrustMe
parent eab4a41b
......@@ -16,7 +16,7 @@
[template]
filename = instance.cfg
md5sum = f0c42061acf3f89c70d258c74c6af9fc
md5sum = b174cb8e4c99d02094960f472584b350
[slaplte.jinja2]
_update_hash_filename_ = slaplte.jinja2
......@@ -80,11 +80,11 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
[template-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg
md5sum = de0452a804b972a23ed96b99814fdaed
md5sum = 9b90e7a418644a4b439cc9784e827263
[template-gnb]
_update_hash_filename_ = instance-gnb.jinja2.cfg
md5sum = 86f305a1daa83aa3b663388d12242764
md5sum = 53a3835bd4da5bef0c893671b6e454ee
[template-core-network]
_update_hash_filename_ = instance-core-network.jinja2.cfg
......
......@@ -142,7 +142,7 @@ logfile = ${xamari-xlog-script:logfile}
forward-host = {{ slapparameter_dict.get('xlog_fluentbit_forward_host', '') }}
forward-port = {{ slapparameter_dict.get('xlog_fluentbit_forward_port', '') }}
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 =
[SERVICE]
flush 5
......
......@@ -147,7 +147,7 @@ logfile = ${xamari-xlog-script:logfile}
forward-host = {{ slapparameter_dict.get('xlog_fluentbit_forward_host', '') }}
forward-port = {{ slapparameter_dict.get('xlog_fluentbit_forward_port', '') }}
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 =
[SERVICE]
flush 5
......
......@@ -230,15 +230,15 @@ init =
except:
options['ipv4'] = "0.0.0.0"
[ors-id]
[comp-id]
recipe = slapos.recipe.build
computer = $${slap-connection:computer-id}
title = $${slap-configuration:root-instance-title}
init =
import socket
options['hostname'] = socket.gethostname()
ors_id = '__'.join(options[x] for x in ('hostname', 'computer', 'title'))
options['ors-id'] = ors_id
comp_id = '__'.join(options[x] for x in ('hostname', 'computer', 'title'))
options['comp-id'] = comp_id
[switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype
......@@ -270,7 +270,7 @@ extensions = jinja2.ext.do
extra-context =
raw monitor_template ${monitor2-template:output}
section ors_version ors-version
section ors_id ors-id
section comp_id comp-id
section slap_configuration slap-configuration
key lte_version amarisoft:lte-version
key lte_expiration amarisoft:lte-expiration
......@@ -312,7 +312,7 @@ extensions = jinja2.ext.do
extra-context =
raw monitor_template ${monitor2-template:output}
section ors_version ors-version
section ors_id ors-id
section comp_id comp-id
key lte_version amarisoft:lte-version
key lte_expiration amarisoft:lte-expiration
key enb amarisoft:enb
......
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