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
Steven Gueguen
slapos
Commits
f1ff454a
Commit
f1ff454a
authored
Feb 15, 2023
by
Ivan Tyagov
Browse files
Options
Browse Files
Download
Plain Diff
Slaposify new CLI option (network-interface).
See merge request
nexedi/slapos!1353
parents
e8c05247
9341b797
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
3 deletions
+9
-3
software/osie-coupler/buildout.hash.cfg
software/osie-coupler/buildout.hash.cfg
+1
-1
software/osie-coupler/instance-input-schema.json
software/osie-coupler/instance-input-schema.json
+5
-0
software/osie-coupler/instance.cfg.in
software/osie-coupler/instance.cfg.in
+2
-1
software/osie-coupler/software.cfg
software/osie-coupler/software.cfg
+1
-1
No files found.
software/osie-coupler/buildout.hash.cfg
View file @
f1ff454a
[instance-profile]
[instance-profile]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
fa8d1d0a44720e0ffa4f6a953b65eae4
md5sum =
b6a9ac23e2bd0779408464f6fbf4a321
software/osie-coupler/instance-input-schema.json
View file @
f1ff454a
...
@@ -62,6 +62,11 @@
...
@@ -62,6 +62,11 @@
"description"
:
"Network address URL type used for Pub/Sub."
,
"description"
:
"Network address URL type used for Pub/Sub."
,
"type"
:
"string"
,
"type"
:
"string"
,
"default"
:
"opc.udp://224.0.0.22:4840/"
"default"
:
"opc.udp://224.0.0.22:4840/"
},
"network_interface"
:
{
"description"
:
"Network interface to be used for Pub/Sub."
,
"type"
:
"string"
,
"default"
:
""
}
}
}
}
}
}
software/osie-coupler/instance.cfg.in
View file @
f1ff454a
...
@@ -19,7 +19,7 @@ recipe = slapos.cookbook:wrapper
...
@@ -19,7 +19,7 @@ recipe = slapos.cookbook:wrapper
environment =
environment =
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:{{ open62541_location }}/lib:{{ mbedtls_location }}/lib
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:{{ open62541_location }}/lib:{{ mbedtls_location }}/lib
command-line =
command-line =
{{ coupler_location }}
/server -d ${instance-parameter:configuration.coupler_block_device} -s ${instance-parameter:configuration.coupler_i2c_slave_list} -p ${instance-parameter:configuration.opc_ua_port} -u ${instance-parameter:configuration.username} -w ${instance-parameter:configuration.password} -b ${instance-parameter:configuration.heart_beat} -t ${instance-parameter:configuration.heart_beat_interval} -l ${instance-parameter:configuration.heart_beat_id_list} -n ${instance-parameter:configuration.network_address_url_data_type} -o ${instance-parameter:configuration.heart_beat_timeout_interval} -i ${instance-parameter:configuration.id} -m ${instance-parameter:configuration.mod
e}
{{ coupler_location }}
server -d ${instance-parameter:configuration.coupler_block_device} -s ${instance-parameter:configuration.coupler_i2c_slave_list} -p ${instance-parameter:configuration.opc_ua_port} -u ${instance-parameter:configuration.username} -w ${instance-parameter:configuration.password} -b ${instance-parameter:configuration.heart_beat} -t ${instance-parameter:configuration.heart_beat_interval} -l ${instance-parameter:configuration.heart_beat_id_list} -n ${instance-parameter:configuration.network_address_url_data_type} -o ${instance-parameter:configuration.heart_beat_timeout_interval} -i ${instance-parameter:configuration.id} -m ${instance-parameter:configuration.mode} -j ${instance-parameter:configuration.network_interfac
e}
wrapper-path = ${directory:service}/coupler-opc-ua
wrapper-path = ${directory:service}/coupler-opc-ua
[instance-parameter]
[instance-parameter]
...
@@ -42,6 +42,7 @@ configuration.heart_beat_interval = 500
...
@@ -42,6 +42,7 @@ configuration.heart_beat_interval = 500
configuration.heart_beat_id_list =
configuration.heart_beat_id_list =
configuration.network_address_url_data_type = opc.udp://224.0.0.22:4840/
configuration.network_address_url_data_type = opc.udp://224.0.0.22:4840/
configuration.heart_beat_timeout_interval = 2000
configuration.heart_beat_timeout_interval = 2000
configuration.network_interface =
[directory]
[directory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
...
...
software/osie-coupler/software.cfg
View file @
f1ff454a
...
@@ -44,7 +44,7 @@ environment +=
...
@@ -44,7 +44,7 @@ environment +=
recipe = slapos.recipe.build:gitclone
recipe = slapos.recipe.build:gitclone
git-executable = ${git:location}/bin/git
git-executable = ${git:location}/bin/git
repository = https://lab.nexedi.com/nexedi/osie.git
repository = https://lab.nexedi.com/nexedi/osie.git
revision =
dc273b64b594de90080afdef873403f953c989f5
revision =
7c49d252659c3c1278591f8c789ab3dd4fa25142
[compile-coupler]
[compile-coupler]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
...
...
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